Skip to content
Snippets Groups Projects
Commit ce47f8c7 authored by Charlotte Hausman's avatar Charlotte Hausman Committed by Charlotte Hausman
Browse files

fix development branch spelling now that 2.8 dev branch is merged into main

parent 4c2e41a7
No related branches found
No related tags found
1 merge request!1211fix development branch spelling now that 2.8 dev branch is merged into main
Pipeline #8242 passed
Stage: cache-build
Stage: build
Stage: unit-test
Stage: test-coverage
Stage: push
Stage: deploy-coverage-page
Stage: deploy
Stage: .post
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 10
− 10
View file @ ce47f8c7
......@@ -37,7 +37,7 @@ workflow:
when: never
- if: $CI_MERGE_REQUEST_IID
- if: $CI_COMMIT_TAG
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
# Import Templates
include:
......@@ -67,7 +67,7 @@ push base image:
- echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
- docker push ${REGISTRY_URL}/ops/base:${PROJECT_NAME}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
changes:
- Dockerfile.base
- docker.properties
......@@ -100,7 +100,7 @@ build cache:
script:
- docker build --no-cache -t cache:${CI_COMMIT_SHORT_SHA} -f Dockerfile.cache . --build-arg WS_VERSION=${VERSION}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
variables:
IMAGE_TAG: $CI_COMMIT_BRANCH
VERSION: 0.0.1+$CI_COMMIT_BRANCH
......@@ -210,7 +210,7 @@ unit test coverage:
- unit test capability
- unit test notification
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
# E2E Tests
......@@ -326,7 +326,7 @@ pages:
- public
expire_in: 2 weeks
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
# Generate PEX builder yaml for child pipeline
pex generate yaml:
......@@ -338,7 +338,7 @@ pex generate yaml:
script:
- DEPLOY_ENV=${DEPLOY_ENV} ./ci/bin/generate-yaml.py
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
changes:
- apps/cli/executables/pexable/**/*
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
......@@ -361,7 +361,7 @@ pex child pipeline:
job: pex generate yaml
strategy: depend
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
changes:
- apps/cli/executables/pexable/**/*
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
......@@ -382,7 +382,7 @@ go generate yaml:
script:
- DEPLOY_ENV=${DEPLOY_ENV} ./ci/bin/generate-go-yaml.py
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
changes:
- apps/cli/executables/go/**/*
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
......@@ -405,7 +405,7 @@ go child pipeline:
job: go generate yaml
strategy: depend
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
changes:
- apps/cli/executables/go/**/*
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
......@@ -426,7 +426,7 @@ deploy:
- sed -i "s/naasc_ENV_secrets:/naasc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
- ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST docker stack deploy --compose-file docker-compose.yml workspaces-${DEPLOY_ENV}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
variables:
IMAGE_TAG: ${CI_COMMIT_BRANCH}
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
......
ci/bin/generate-go-yaml.py
+ 1
− 1
View file @ ce47f8c7
......@@ -99,7 +99,7 @@ def main(argv):
deploy_env = os.environ["DEPLOY_ENV"]
go_changes = []
rule = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/"
rule = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/"
changes_rule = ""
if deploy_env == "dev":
......
ci/bin/generate-yaml.py
+ 1
− 1
View file @ ce47f8c7
......@@ -95,7 +95,7 @@ def main(argv):
deploy_env = os.environ["DEPLOY_ENV"]
pex_changes = []
rule = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/"
rule = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/"
changes_rule = ""
if deploy_env == "dev":
......
ci/build.template.yml
+ 1
− 1
View file @ ce47f8c7
......@@ -10,7 +10,7 @@
reports:
dotenv: build.env
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
variables:
IMAGE_TAG: $CI_COMMIT_BRANCH
VERSION: 0.0.1+$CI_COMMIT_BRANCH
......
ci/cleanup.template.yml
+ 1
− 1
View file @ ce47f8c7
......@@ -9,6 +9,6 @@
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_COMMIT_MESSAGE =~ /\A(?i)-debug/'
when: never
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: $CI_COMMIT_TAG
ci/push.template.yml
+ 1
− 1
View file @ ce47f8c7
......@@ -6,7 +6,7 @@
- docker push ${NAME}:${CI_COMMIT_SHORT_SHA}
- docker push ${NAME}:${IMAGE_TAG}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
variables:
IMAGE_TAG: $CI_COMMIT_BRANCH
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
......
ci/unit-test.template.yml
+ 1
− 1
View file @ ce47f8c7
......@@ -12,7 +12,7 @@
paths:
- .coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELPMENT/'
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /^[0-9]\.[0-9]-DEVELOPMENT/'
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
variables:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment