fix test versioning for 3.10

.gitlab-ci.yml

@@ -91,7 +91,11 @@ build cache:
             IMAGE_TAG: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
             VERSION: 0.0.1+$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
         - 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]+/'
+          variables:
+            IMAGE_TAG: $CI_COMMIT_TAG
+            VERSION: 0.0.2+$CI_COMMIT_TAG
+        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
             VERSION: $CI_COMMIT_TAG

ci/build.template.yml

@@ -21,7 +21,13 @@
             VERSION: 0.0.1+$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
             DEPLOY_ENV: "dev"
         - 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]+/'
+          variables:
+            IMAGE_TAG: $CI_COMMIT_TAG
+            VERSION: 0.0.2+$CI_COMMIT_TAG
+            # override DEPLOY_ENV
+            DEPLOY_ENV: "test"
+        - if: '$CI_COMMIT_TAG =~ /[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+/'
           variables:
             IMAGE_TAG: $CI_COMMIT_TAG
             VERSION: $CI_COMMIT_TAG