Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: CI
on:
push:
branches: [ develop, master ]
branches: [ main ]
pull_request:
branches: [ develop, master ]
branches: [ main ]
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://dev.azure.com/City-of-Helsinki/palvelukartta/_apis/build/status/smbackend%20Test?repoName=City-of-Helsinki%2Fsmbackend&branchName=develop)](https://dev.azure.com/City-of-Helsinki/palvelukartta/_build/latest?definitionId=921&repoName=City-of-Helsinki%2Fsmbackend&branchName=develop)
[![Build Status](https://dev.azure.com/City-of-Helsinki/palvelukartta/_apis/build/status/smbackend%20Test?repoName=City-of-Helsinki%2Fsmbackend&branchName=main)](https://dev.azure.com/City-of-Helsinki/palvelukartta/_build/latest?definitionId=921&repoName=City-of-Helsinki%2Fsmbackend&branchName=main)
[![Codecov](https://codecov.io/gh/City-of-Helsinki/smbackend/branch/master/graph/badge.svg)](https://codecov.io/gh/City-of-Helsinki/smbackend)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=City-of-Helsinki_smbackend&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=City-of-Helsinki_smbackend)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
Expand Down
37 changes: 0 additions & 37 deletions azure-pipelines-devtest.yml

This file was deleted.

36 changes: 0 additions & 36 deletions azure-pipelines-stageprod.yml

This file was deleted.

52 changes: 52 additions & 0 deletions pipelines/palvelukartta-api-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# Continuous integration (CI) triggers cause a pipeline to run whenever you push
# an update to the specified branches or you push specified tags.
trigger:
batch: true
branches:
include:
- main
paths:
exclude:
- '*release-please*'
- '*.md'
- '.github/'
- 'pipelines/palvelukartta-api-release.yml'
- 'pipelines/palvelukartta-api-review.yml'
- 'docker-compose*'

# Pull request (PR) triggers cause a pipeline to run whenever a pull request is
# opened with one of the specified target branches, or when updates are made to
# such a pull request.
#
# GitHub creates a new ref when a pull request is created. The ref points to a
# merge commit, which is the merged code between the source and target branches
# of the pull request.
#
# Opt out of pull request validation
pr: none

# By default, use self-hosted agents
pool: Default

resources:
repositories:
# Azure DevOps repository
- repository: palvelukartta-pipelines
type: git
# Azure DevOps project/repository
name: palvelukartta/palvelukartta-pipelines

extends:
# Filename in Azure DevOps Repository
template: components/palvelukartta-api/pipelines/palvelukartta-api-dev.yml@palvelukartta-pipelines
# parameters:
# Application build arguments and config map values as key value pairs.
# Does not contain all buildArguments or configMap values, the rest located in palvelukartta-pipelines
# The values here will override the values defined in the palvelukartta-pipelines repository
# buildArgs:
# DEBUG: 1
# configMap: # pod environment variables
# DEBUG: 1
## Default value to pythonVersion is set on template.
## Used tool version
# pythonVersion: 3.11
49 changes: 49 additions & 0 deletions pipelines/palvelukartta-api-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Continuous integration (CI) triggers cause a pipeline to run whenever you push
# an update to the specified branches or you push specified tags.
trigger:
batch: true
tags:
include:
- smbackend-v*

# Pull request (PR) triggers cause a pipeline to run whenever a pull request is
# opened with one of the specified target branches, or when updates are made to
# such a pull request.
#
# GitHub creates a new ref when a pull request is created. The ref points to a
# merge commit, which is the merged code between the source and target branches
# of the pull request.
#
# Opt out of pull request validation
pr: none

# By default, use self-hosted agents
pool: Default

resources:
repositories:
# Azure DevOps repository
- repository: palvelukartta-pipelines
type: git
# Azure DevOps project/repository
name: palvelukartta/palvelukartta-pipelines

extends:
# Filename in Azure DevOps Repository
template: components/palvelukartta-api/pipelines/palvelukartta-api-release.yml@palvelukartta-pipelines
# parameters:
# Application build arguments and config map values as key value pairs.
# Does not contain all buildArguments or configMap values, the rest located in palvelukartta-pipelines
# The values here will override the values defined in the palvelukartta-pipelines repository
## Staging definitions
# buildArgsStage:
# DEBUG: 1
# configMapStage: # pod environment variables
# DEBUG: 1
## Production definitions
## Production is using staging image
# configMap: # pod environment variables
# DEBUG: 1
## Default value to pythonVersion is set on template.
## Used tool version
# pythonVersion: 3.11
57 changes: 57 additions & 0 deletions pipelines/palvelukartta-api-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#
# Review pipeline. Run build and deploy for Platta dev environments.
# Pipeline runs different tests e.g. unittest and browser tests.
#
# Continuous integration (CI) triggers cause a pipeline to run whenever you push
# an update to the specified branches or you push specified tags.
# only PR trigger pipeline
trigger: none

# Pull request (PR) triggers cause a pipeline to run whenever a pull request is
# opened with one of the specified target branches, or when updates are made to
# such a pull request.
#
# GitHub creates a new ref when a pull request is created. The ref points to a
# merge commit, which is the merged code between the source and target branches
# of the pull request.
#
# Opt out of pull request validation
pr:
# PR target branch
branches:
include:
- main
paths:
exclude:
- '*release-please*'
- '*.md'
- '.github/'
- 'pipelines/palvelukartta-api-release.yml'
- 'pipelines/palvelukartta-api-dev.yml'
- 'docker-compose*'

# By default, use self-hosted agents
pool: Default

resources:
repositories:
# Azure DevOps repository
- repository: palvelukartta-pipelines
type: git
# Azure DevOps project/repository
name: palvelukartta/palvelukartta-pipelines

extends:
# Filename in Azure DevOps Repository
template: components/palvelukartta-api/pipelines/palvelukartta-api-review.yml@palvelukartta-pipelines
# parameters:
# Application build arguments and config map values as key value pairs.
# Does not contain all buildArguments or configMap values, the rest located in palvelukartta-pipelines
# The values here will override the values defined in the palvelukartta-pipelines repository
# buildArgs:
# DEBUG: 1
# configMap: # pod environment variables
# DEBUG: 1
## Default value to pythonVersion is set on template.
## Used tool version
# pythonVersion: 3.11
Loading