From bbbe8b4f05cb9f75873b096ae4f736ac6a486d28 Mon Sep 17 00:00:00 2001
From: Nailia Iskhakova <niskhakova@gitlab.com>
Date: Thu, 24 Aug 2023 15:33:51 +0200
Subject: [PATCH 1/2] Pull GitLab version value for stable releases

Signed-off-by: Nailia Iskhakova <niskhakova@gitlab.com>
---
 .gitlab-ci.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fc332316d..d3d2df77a5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -237,7 +237,12 @@ lint_package:
     - echo "export REGISTRY_URL=registry-$HOST_SUFFIX.$KUBE_INGRESS_BASE_DOMAIN"     >> "${VARIABLES_FILE}"
     - echo "export S3_ENDPOINT=https://minio-$HOST_SUFFIX.$KUBE_INGRESS_BASE_DOMAIN" >> "${VARIABLES_FILE}"
     - kubectl wait pods -n $NAMESPACE -l app=toolbox,release=$RELEASE_NAME  --for condition=Ready --timeout=60s
-    - echo "export QA_GITLAB_REVISION=`kubectl exec -i $(kubectl get pods -lrelease=$RELEASE_NAME,app=toolbox -o custom-columns=":metadata.name") -c toolbox -- cat /srv/gitlab/REVISION`" >> "${VARIABLES_FILE}"
+    - if [ $PIPELINE_TYPE =~ /STABLE_BRANCH_PIPELINE$/ ]; then
+    -   QA_GITLAB_VERSION_COMMAND="cat /srv/gitlab/VERSION" # to pull latest QA image for stable release
+    - else
+    -   QA_GITLAB_VERSION_COMMAND="cat /srv/gitlab/REVISION"
+    - fi;
+    - echo "export QA_GITLAB_REVISION=`kubectl exec -i $(kubectl get pods -lrelease=$RELEASE_NAME,app=toolbox -o custom-columns=":metadata.name") -c toolbox -- $QA_GITLAB_VERSION_COMMAND`" >> "${VARIABLES_FILE}"
   artifacts:
     when: always
     paths:
-- 
GitLab


From fd289bf7d4b0c690b88aa748dbf02611174d4e32 Mon Sep 17 00:00:00 2001
From: Nailia Iskhakova <niskhakova@gitlab.com>
Date: Thu, 24 Aug 2023 17:05:28 +0200
Subject: [PATCH 2/2] Use separate QA variable for version in stable

Signed-off-by: Nailia Iskhakova <niskhakova@gitlab.com>
---
 .gitlab-ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3d2df77a5..0eeca9a184 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -237,12 +237,14 @@ lint_package:
     - echo "export REGISTRY_URL=registry-$HOST_SUFFIX.$KUBE_INGRESS_BASE_DOMAIN"     >> "${VARIABLES_FILE}"
     - echo "export S3_ENDPOINT=https://minio-$HOST_SUFFIX.$KUBE_INGRESS_BASE_DOMAIN" >> "${VARIABLES_FILE}"
     - kubectl wait pods -n $NAMESPACE -l app=toolbox,release=$RELEASE_NAME  --for condition=Ready --timeout=60s
-    - if [ $PIPELINE_TYPE =~ /STABLE_BRANCH_PIPELINE$/ ]; then
-    -   QA_GITLAB_VERSION_COMMAND="cat /srv/gitlab/VERSION" # to pull latest QA image for stable release
+    - if [[ $PIPELINE_TYPE == *STABLE_BRANCH_PIPELINE* ]]; then
+    -   QA_GITLAB_VERSION_COMMAND="cat /srv/gitlab/VERSION"; # to pull latest QA image for stable release
+    -   QA_GITLAB_VARIABLE_NAME="QA_GITLAB_VERSION";
     - else
-    -   QA_GITLAB_VERSION_COMMAND="cat /srv/gitlab/REVISION"
+    -   QA_GITLAB_VERSION_COMMAND="cat /srv/gitlab/REVISION";
+    -   QA_GITLAB_VARIABLE_NAME="QA_GITLAB_REVISION";
     - fi;
-    - echo "export QA_GITLAB_REVISION=`kubectl exec -i $(kubectl get pods -lrelease=$RELEASE_NAME,app=toolbox -o custom-columns=":metadata.name") -c toolbox -- $QA_GITLAB_VERSION_COMMAND`" >> "${VARIABLES_FILE}"
+    - echo "export $QA_GITLAB_VARIABLE_NAME=`kubectl exec -i $(kubectl get pods -lrelease=$RELEASE_NAME,app=toolbox -o custom-columns=":metadata.name") -c toolbox -- $QA_GITLAB_VERSION_COMMAND`" >> "${VARIABLES_FILE}"
   artifacts:
     when: always
     paths:
@@ -749,6 +751,8 @@ production_specs_eks:
     - source "${VARIABLES_FILE}"
     - if [ -n "$QA_GITLAB_REVISION" ]; then
     -   QA_IMAGE="registry.gitlab.com/gitlab-org/gitlab/gitlab-ee-qa:$QA_GITLAB_REVISION"
+    - elif [ -n "$QA_GITLAB_VERSION" ]; then
+    -   QA_IMAGE="gitlab/gitlab-ee-qa:$QA_GITLAB_VERSION"
     - else
     -   QA_IMAGE="gitlab/gitlab-ee-qa:nightly" # this will default to use nightly https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md#specifying-the-gitlab-version
     - fi;
-- 
GitLab