Merge branch 'GONGR-7357-Refactoring_job_names_in_CICD_pipelines' into 'master'

GONGR-7357: Refactor names in pipelines

See merge request !713

devops/gc/pipeline/override-stages.yml

@@ -4,13 +4,13 @@ variables:
   NO_DATA_ACCESS_TESTER: $GC_NO_DATA_ACCESS_TESTER
   OPA_INTEGRATION_ENABLED: "true"
 
-.define_DATA_BRANCH:
+.gc_define_DATA_BRANCH:
   script:
     - >
       if [[ -z $CI_COMMIT_TAG ]] && [[ $CI_COMMIT_BRANCH =~ ^release\/[0-9]{1,2}.[0-9]{1,2}$ ]];
       then
         REF_DATA_BRANCH=$CI_COMMIT_BRANCH
-      elif [[ $CI_COMMIT_TAG =~ ^v[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}$ ]];
+      elif [[ $CI_COMMIT_TAG =~ ^v[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}.* ]];
       then
         TAG=$(echo $CI_COMMIT_TAG | sed "s/^v//");
         REF_DATA_BRANCH="release/${TAG%.*}";
@@ -29,13 +29,13 @@ gc-containerize-bootstrap-gitlab:
     GC_ENABLE_BOOTSTRAP: "true"
     BUILD_ARGS: "--build-arg DATA_BRANCH=$REF_DATA_BRANCH"
   before_script:
-    - !reference [.define_DATA_BRANCH, script]
+    - !reference [.gc_define_DATA_BRANCH, script]
 
 gc-containerize-bootstrap-gcr:
   variables:
     GC_ENABLE_BOOTSTRAP: "true"
     BUILD_ARGS: "--build-arg DATA_BRANCH=$REF_DATA_BRANCH"
   before_script:
-    - !reference [.define_DATA_BRANCH, script]
+    - !reference [.gc_define_DATA_BRANCH, script]
     - gcloud auth activate-service-account --key-file=${GC_BAREMETAL_DEPLOY_FILE}
     - gcloud auth configure-docker gcr.io