More instances of version number changes

ci/bin/generate-go-yaml.py

@@ -101,7 +101,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]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/"
+    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

@@ -11,7 +11,7 @@
         reports:
             dotenv: build.env
     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])*)-DEVELOPMENT/'
           variables:
             IMAGE_TAG: $CI_COMMIT_BRANCH
             VERSION: 0.0.1+$CI_COMMIT_BRANCH

ci/cleanup.template.yml

@@ -7,7 +7,7 @@
             "${NAME}:${IMAGE_TAG}"
         - docker image rm --force "${REGISTRY_URL}/workspaces/${SERVICE_NAME}:${IMAGE_TAG}"
     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])*)-DEVELOPMENT/'
         variables:
           IMAGE_TAG: $CI_COMMIT_BRANCH
         changes:

ci/push-package.template.yml

@@ -18,7 +18,7 @@
       - echo "Releasing PEX to sbin area - ${PACKAGE_NAME}"
       - scp ${PACKAGE_NAME} root@shipman.aoc.nrao.edu:/lustre/aoc/cluster/pipeline/dsoc-${DEPLOY_ENV}/workspaces/sbin/
     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])*)-DEVELOPMENT/'
         variables:
           DEPLOY_ENV: "dev"
         changes:

ci/push.template.yml

@@ -5,7 +5,7 @@
         - NAME="${REGISTRY_URL}/workspaces/${SERVICE_NAME}"
         - docker push ${NAME}:${IMAGE_TAG}
     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])*)-DEVELOPMENT/'
           variables:
             IMAGE_TAG: $CI_COMMIT_BRANCH
           changes:

ci/unit-test.template.yml

@@ -11,7 +11,7 @@
         paths:
             - .coverage.${SERVICE_NAME}.${CI_COMMIT_SHORT_SHA}
     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])*)-DEVELOPMENT/'
           variables:
             IMAGE_TAG: $CI_COMMIT_BRANCH
           changes: