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

Merge branch '2.8.1.1_messaging_fixes' into '2.8.1.1-Development' 

make pipeline handle 4 digit version tags

See merge request !1398
parents 2448c547 35c2d18e
No related branches found
No related tags found
3 merge requests!1408catch up with 2.8.1.1, pin zope.sqlalchemy to 2.0,!1405merge 2.8.1.1 to main,!1398make pipeline handle 4 digit version tags
Pipeline #10195 passed
Stage: cache-build
Stage: build
Stage: build-pex-base
Stage: unit-test
Stage: push
Stage: generate-pex-yaml
Stage: pex-trigger
Stage: generate-go-yaml
Stage: go-trigger
Stage: deploy
Stage: .post
Pipeline: workspaces

#10199

    Pipeline: workspaces

    #10198

      Hide whitespace changes
      Inline Side-by-side
      .gitlab-ci.yml
      + 14
      − 14
      View file @ 784606ab
      ...@@ -80,11 +80,11 @@ build-pex-base image: ...@@ -80,11 +80,11 @@ build-pex-base image:
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELPMENT/'
      changes: changes:
      - apps/cli/executables/pexable/**/* - 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      # override DEPLOY_ENV # override DEPLOY_ENV
      DEPLOY_ENV: "test" DEPLOY_ENV: "test"
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      DEPLOY_ENV: "prod" DEPLOY_ENV: "prod"
      ...@@ -112,11 +112,11 @@ build cache: ...@@ -112,11 +112,11 @@ build cache:
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      VERSION: 0.0.2+$CI_COMMIT_TAG VERSION: 0.0.2+$CI_COMMIT_TAG
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      VERSION: $CI_COMMIT_TAG VERSION: $CI_COMMIT_TAG
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      VERSION: $CI_COMMIT_TAG VERSION: $CI_COMMIT_TAG
      ...@@ -303,11 +303,11 @@ pex generate yaml: ...@@ -303,11 +303,11 @@ pex generate yaml:
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
      changes: changes:
      - apps/cli/executables/pexable/**/* - 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      # override DEPLOY_ENV # override DEPLOY_ENV
      DEPLOY_ENV: "test" DEPLOY_ENV: "test"
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      DEPLOY_ENV: "prod" DEPLOY_ENV: "prod"
      artifacts: artifacts:
      ...@@ -326,11 +326,11 @@ pex child pipeline: ...@@ -326,11 +326,11 @@ pex child pipeline:
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
      changes: changes:
      - apps/cli/executables/pexable/**/* - 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      # override DEPLOY_ENV # override DEPLOY_ENV
      DEPLOY_ENV: "test" DEPLOY_ENV: "test"
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      DEPLOY_ENV: "prod" DEPLOY_ENV: "prod"
      ...@@ -347,11 +347,11 @@ go generate yaml: ...@@ -347,11 +347,11 @@ go generate yaml:
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
      changes: changes:
      - apps/cli/executables/go/**/* - 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      # override DEPLOY_ENV # override DEPLOY_ENV
      DEPLOY_ENV: "test" DEPLOY_ENV: "test"
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      DEPLOY_ENV: "prod" DEPLOY_ENV: "prod"
      artifacts: artifacts:
      ...@@ -370,11 +370,11 @@ go child pipeline: ...@@ -370,11 +370,11 @@ go child pipeline:
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
      changes: changes:
      - apps/cli/executables/go/**/* - 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      # override DEPLOY_ENV # override DEPLOY_ENV
      DEPLOY_ENV: "test" DEPLOY_ENV: "test"
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      DEPLOY_ENV: "prod" DEPLOY_ENV: "prod"
      ...@@ -391,7 +391,7 @@ deploy: ...@@ -391,7 +391,7 @@ deploy:
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
      variables: variables:
      IMAGE_TAG: ${CI_COMMIT_BRANCH} 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      # override DEPLOY_ENV # override DEPLOY_ENV
      ...@@ -400,7 +400,7 @@ deploy: ...@@ -400,7 +400,7 @@ deploy:
      DL_HOST: https://dl-dsoc-test.nrao.edu DL_HOST: https://dl-dsoc-test.nrao.edu
      # override ENV_HOST # override ENV_HOST
      ENV_HOST: ws-test.nrao.edu ENV_HOST: ws-test.nrao.edu
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      # override DEPLOY_ENV # override DEPLOY_ENV
      ......
      ci/bin/generate-go-yaml.py
      + 2
      − 2
      View file @ 784606ab
      ...@@ -127,9 +127,9 @@ def main(argv): ...@@ -127,9 +127,9 @@ def main(argv):
      - apps/cli/executables/go/**/*""" - apps/cli/executables/go/**/*"""
      else: else:
      if deploy_env == "test": if deploy_env == "test":
      rule = "$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/" rule = "$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/"
      if deploy_env == "prod": if deploy_env == "prod":
      rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/" rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/"
      write_global_rule(rule=rule) write_global_rule(rule=rule)
      go_changes = get_list_of_go_modules() go_changes = get_list_of_go_modules()
      ......
      ci/bin/generate-yaml.py
      + 2
      − 2
      View file @ 784606ab
      ...@@ -122,9 +122,9 @@ def main(argv): ...@@ -122,9 +122,9 @@ def main(argv):
      - apps/cli/executables/pexable/**/*""" - apps/cli/executables/pexable/**/*"""
      else: else:
      if deploy_env == "test": if deploy_env == "test":
      rule = "$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/" rule = "$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/"
      if deploy_env == "prod": if deploy_env == "prod":
      rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/" rule = "$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/"
      write_global_rule(rule=rule) write_global_rule(rule=rule)
      pex_changes = get_list_of_pexables() pex_changes = get_list_of_pexables()
      ......
      ci/build.template.yml
      + 2
      − 2
      View file @ 784606ab
      ...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
      VERSION: 0.0.2+$CI_COMMIT_TAG VERSION: 0.0.2+$CI_COMMIT_TAG
      # override DEPLOY_ENV # override DEPLOY_ENV
      DEPLOY_ENV: "test" DEPLOY_ENV: "test"
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      VERSION: $CI_COMMIT_TAG VERSION: $CI_COMMIT_TAG
      # override DEPLOY_ENV # override DEPLOY_ENV
      DEPLOY_ENV: "test" DEPLOY_ENV: "test"
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      VERSION: $CI_COMMIT_TAG VERSION: $CI_COMMIT_TAG
      ......
      ci/push.template.yml
      + 2
      − 2
      View file @ 784606ab
      ...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_BRANCH 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      dependencies: [] dependencies: []
      ci/unit-test.template.yml
      + 2
      − 2
      View file @ 784606ab
      ...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
      rules: rules:
      - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/' - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
      - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - 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]+/' - if: '$CI_COMMIT_TAG =~ /^end-of-sprint-[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0.9]+-rc[0-9]+/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/' - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+$/ || $CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/'
      variables: variables:
      IMAGE_TAG: $CI_COMMIT_TAG IMAGE_TAG: $CI_COMMIT_TAG
      dependencies: [] dependencies: []
      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