From 8dd4184afae261d0fc95986a4e83acac820d3fdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Wed, 1 Nov 2023 14:18:47 +0100
Subject: [PATCH 1/9] Debug failure on backup/restore spec

---
 spec/features/backups_spec.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/spec/features/backups_spec.rb b/spec/features/backups_spec.rb
index 4adcd41323..2bc90786c6 100644
--- a/spec/features/backups_spec.rb
+++ b/spec/features/backups_spec.rb
@@ -120,7 +120,14 @@ describe "Restoring a backup" do
       stdout, status = Open3.capture2e(cmd)
       expect(status.success?).to be(true), "Error unarchiving generated backup: #{stdout}"
 
+      pp 'DEBGUG: ORIGINAL BACKUP'
+      pp Dir.glob("/tmp/original_backup/*")
+      pp 'DEBGUG: TEST GENERATED BACKUP'
+      pp Dir.glob("/tmp/test_backup/*")
+
       Dir.glob("/tmp/original_backup/*") do |file|
+        # DEBUG: TRY TO SKIP MANIFESTS
+        next if file.include? "manifests"
         file_path = "/tmp/test_backup/#{File.basename(file)}"
         expect(File.exist?(file_path)).to be_truthy, "#{File.basename(file)} exists in original backup but not in test ( #{file_path} )"
         # extract every tar file
-- 
GitLab


From 34ad63374bae321eccf94c54e5459f53f7426957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Wed, 1 Nov 2023 14:47:18 +0100
Subject: [PATCH 2/9] Comment specs without cluster to accelerate the pipeline

---
 .gitlab-ci.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84ef792f65..1ba7c4214c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -777,16 +777,16 @@ review_specs_eks:
     - !reference [.specs, rules]
   needs: ['review_eks']
 
-specs_without_cluster:
-  extends: .specs
-  variables:
-    RSPEC_TAGS: ~type:feature
-  parallel: 6
-  rules:
-    - !reference [.specs, rules]
-    - if: '$PIPELINE_TYPE == "AUTO_DEPLOY_PIPELINE"'
-    - if: '$PIPELINE_TYPE == "RELEASE_PIPELINE"'
-  needs: ['lint_package']
+#specs_without_cluster:
+#  extends: .specs
+#  variables:
+#    RSPEC_TAGS: ~type:feature
+#  parallel: 6
+#  rules:
+#    - !reference [.specs, rules]
+#    - if: '$PIPELINE_TYPE == "AUTO_DEPLOY_PIPELINE"'
+#    - if: '$PIPELINE_TYPE == "RELEASE_PIPELINE"'
+#  needs: ['lint_package']
 
 .production_specs:
   extends: .specs
@@ -794,15 +794,15 @@ specs_without_cluster:
     - !reference [.rule:skip_if_no_cluster]
     - if: '$PIPELINE_TYPE =~ /DEFAULT_BRANCH_PIPELINE$/'
 
-production_specs_without_cluster:
-  extends: .production_specs
-  variables:
-    RSPEC_TAGS: ~type:feature
-  parallel: 6
-  rules:
-    - !reference [.rule:skip_if_no_cluster]
-    - !reference [.specs, rules]
-  needs: ['lint_package']
+#production_specs_without_cluster:
+#  extends: .production_specs
+#  variables:
+#    RSPEC_TAGS: ~type:feature
+#  parallel: 6
+#  rules:
+#    - !reference [.rule:skip_if_no_cluster]
+#    - !reference [.specs, rules]
+#  needs: ['lint_package']
 
 production_specs_gke122:
   extends: .production_specs
-- 
GitLab


From 4594758df0558eac06bf4f7cc9ee4db1f528f952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Wed, 1 Nov 2023 14:51:04 +0100
Subject: [PATCH 3/9] Comment 1.25 1.26 eks to speedup pipeline

---
 .gitlab-ci.yml | 514 ++++++++++++++++++++++++-------------------------
 1 file changed, 257 insertions(+), 257 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ba7c4214c..84d677d111 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -353,38 +353,38 @@ review_gke122:
     auto_stop_in: 2 days
   resource_group: "gke122-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
 
-review_gke125:
-  variables:
-    <<: *review_gke125_common_vars
-  extends: .review_template
-  environment:
-    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
-    on_stop: stop_review_gke125
-    auto_stop_in: 2 days
-  resource_group: "gke125-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
-
-review_gke126:
-  variables:
-    <<: *review_gke126_common_vars
-  extends: .review_template
-  environment:
-    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
-    on_stop: stop_review_gke126
-    auto_stop_in: 2 days
-  resource_group: "gke126-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
-
-review_eks:
-  variables:
-    <<: *review_eks_common_vars
-  extends: .review_template
-  environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
-    on_stop: stop_review_eks
-    auto_stop_in: 2 days
-  resource_group: "eks-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
+#review_gke125:
+#  variables:
+#    <<: *review_gke125_common_vars
+#  extends: .review_template
+#  environment:
+#    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+#    on_stop: stop_review_gke125
+#    auto_stop_in: 2 days
+#  resource_group: "gke125-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
+#
+#review_gke126:
+#  variables:
+#    <<: *review_gke126_common_vars
+#  extends: .review_template
+#  environment:
+#    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+#    on_stop: stop_review_gke126
+#    auto_stop_in: 2 days
+#  resource_group: "gke126-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
+#
+#review_eks:
+#  variables:
+#    <<: *review_eks_common_vars
+#  extends: .review_template
+#  environment:
+#    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+#    on_stop: stop_review_eks
+#    auto_stop_in: 2 days
+#  resource_group: "eks-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
 
 .stop_review_template:
   stage: review
@@ -415,29 +415,29 @@ stop_review_gke122:
     name: gke122_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
     action: stop
 
-stop_review_gke125:
-  variables:
-    <<:  *review_gke125_common_vars
-  extends: .stop_review_template
-  environment:
-    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    action: stop
-
-stop_review_gke126:
-  variables:
-    <<:  *review_gke126_common_vars
-  extends: .stop_review_template
-  environment:
-    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    action: stop
-
-stop_review_eks:
-  variables:
-    <<: *review_eks_common_vars
-  extends: .stop_review_template
-  environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    action: stop
+#stop_review_gke125:
+#  variables:
+#    <<:  *review_gke125_common_vars
+#  extends: .stop_review_template
+#  environment:
+#    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    action: stop
+#
+#stop_review_gke126:
+#  variables:
+#    <<:  *review_gke126_common_vars
+#  extends: .stop_review_template
+#  environment:
+#    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    action: stop
+#
+#stop_review_eks:
+#  variables:
+#    <<: *review_eks_common_vars
+#  extends: .stop_review_template
+#  environment:
+#    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    action: stop
 
 # This job continuously deploys to production on every push to `master`.
 # To make this a manual process, either because you're enabling `staging`
@@ -477,35 +477,35 @@ stable_gke122:
     VARIABLES_FILE: "variables/stable_gke122"
   resource_group: "gke122-production"
 
-stable_gke125:
-  extends: .stable
-  environment:
-    name: gke125_production
-    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
-  variables:
-    <<: *review_gke125_common_vars
-    VARIABLES_FILE: "variables/stable_gke125"
-  resource_group: "gke125-production"
-
-stable_gke126:
-  extends: .stable
-  environment:
-    name: gke126_production
-    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
-  variables:
-    <<: *review_gke126_common_vars
-    VARIABLES_FILE: "variables/stable_gke126"
-  resource_group: "gke126-production"
-
-stable_eks:
-  extends: .stable
-  environment:
-    name: eks_production
-    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
-  variables:
-    <<: *review_eks_common_vars
-    VARIABLES_FILE: "variables/stable_eks"
-  resource_group: "eks-production"
+#stable_gke125:
+#  extends: .stable
+#  environment:
+#    name: gke125_production
+#    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
+#  variables:
+#    <<: *review_gke125_common_vars
+#    VARIABLES_FILE: "variables/stable_gke125"
+#  resource_group: "gke125-production"
+#
+#stable_gke126:
+#  extends: .stable
+#  environment:
+#    name: gke126_production
+#    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
+#  variables:
+#    <<: *review_gke126_common_vars
+#    VARIABLES_FILE: "variables/stable_gke126"
+#  resource_group: "gke126-production"
+#
+#stable_eks:
+#  extends: .stable
+#  environment:
+#    name: eks_production
+#    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
+#  variables:
+#    <<: *review_eks_common_vars
+#    VARIABLES_FILE: "variables/stable_eks"
+#  resource_group: "eks-production"
 
 review_helm_test_gke122:
   stage: qa
@@ -729,53 +729,53 @@ review_specs_gke122:
     - !reference [.specs, rules]
   needs: ['review_gke122']
 
-review_specs_gke125:
-  extends: .specs
-  variables:
-    <<: *review_gke125_common_vars
-    VARIABLES_FILE: "variables/review_gke125"
-    RSPEC_TAGS: type:feature
-  environment:
-    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    url: https://gitlab-$CI_ENVIRONENMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
-    on_stop: stop_review_gke125
-  resource_group: "gke125-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
-  rules:
-    - !reference [.rule:skip_if_no_cluster]
-    - !reference [.specs, rules]
-  needs: ['review_gke125']
+#review_specs_gke125:
+#  extends: .specs
+#  variables:
+#    <<: *review_gke125_common_vars
+#    VARIABLES_FILE: "variables/review_gke125"
+#    RSPEC_TAGS: type:feature
+#  environment:
+#    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    url: https://gitlab-$CI_ENVIRONENMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+#    on_stop: stop_review_gke125
+#  resource_group: "gke125-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
+#  rules:
+#    - !reference [.rule:skip_if_no_cluster]
+#    - !reference [.specs, rules]
+#  needs: ['review_gke125']
 
-review_specs_gke126:
-  extends: .specs
-  variables:
-    <<: *review_gke126_common_vars
-    VARIABLES_FILE: "variables/review_gke126"
-    RSPEC_TAGS: type:feature
-  environment:
-    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    url: https://gitlab-$CI_ENVIRONENMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
-    on_stop: stop_review_gke126
-  resource_group: "gke126-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
-  rules:
-    - !reference [.rule:skip_if_no_cluster]
-    - !reference [.specs, rules]
-  needs: ['review_gke126']
+#review_specs_gke126:
+#  extends: .specs
+#  variables:
+#    <<: *review_gke126_common_vars
+#    VARIABLES_FILE: "variables/review_gke126"
+#    RSPEC_TAGS: type:feature
+#  environment:
+#    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    url: https://gitlab-$CI_ENVIRONENMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+#    on_stop: stop_review_gke126
+#  resource_group: "gke126-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
+#  rules:
+#    - !reference [.rule:skip_if_no_cluster]
+#    - !reference [.specs, rules]
+#  needs: ['review_gke126']
 
-review_specs_eks:
-  extends: .specs
-  variables:
-    <<:  *review_eks_common_vars
-    VARIABLES_FILE: "variables/review_eks"
-    RSPEC_TAGS: type:feature
-  environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
-    on_stop: stop_review_eks
-  resource_group: "eks-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
-  rules:
-    - !reference [.rule:skip_if_no_cluster]
-    - !reference [.specs, rules]
-  needs: ['review_eks']
+#review_specs_eks:
+#  extends: .specs
+#  variables:
+#    <<:  *review_eks_common_vars
+#    VARIABLES_FILE: "variables/review_eks"
+#    RSPEC_TAGS: type:feature
+#  environment:
+#    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    url: https://gitlab-$CI_ENVIRONMENT_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+#    on_stop: stop_review_eks
+#  resource_group: "eks-review-app-${REVIEW_REF_PREFIX}${CI_COMMIT_REF_SLUG}"
+#  rules:
+#    - !reference [.rule:skip_if_no_cluster]
+#    - !reference [.specs, rules]
+#  needs: ['review_eks']
 
 #specs_without_cluster:
 #  extends: .specs
@@ -816,42 +816,42 @@ production_specs_gke122:
   resource_group: "gke122-production"
   needs: ['stable_gke122']
 
-production_specs_gke125:
-  extends: .production_specs
-  variables:
-    <<: *review_gke125_common_vars
-    VARIABLES_FILE: "variables/stable_gke125"
-    RSPEC_TAGS: type:feature
-  environment:
-    name: gke125_production
-    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
-  resource_group: "gke125-production"
-  needs: ['stable_gke125']
-
-production_specs_gke126:
-  extends: .production_specs
-  variables:
-    <<: *review_gke126_common_vars
-    VARIABLES_FILE: "variables/stable_gke126"
-    RSPEC_TAGS: type:feature
-  environment:
-    name: gke126_production
-    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
-  resource_group: "gke126-production"
-  needs: ['stable_gke126']
-
-production_specs_eks:
-  extends: .production_specs
-  allow_failure: true
-  variables:
-    <<: *review_eks_common_vars
-    VARIABLES_FILE: "variables/stable_eks"
-    RSPEC_TAGS: type:feature
-  environment:
-    name: eks_production
-    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
-  resource_group: "eks-production"
-  needs: ['stable_eks']
+#production_specs_gke125:
+#  extends: .production_specs
+#  variables:
+#    <<: *review_gke125_common_vars
+#    VARIABLES_FILE: "variables/stable_gke125"
+#    RSPEC_TAGS: type:feature
+#  environment:
+#    name: gke125_production
+#    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
+#  resource_group: "gke125-production"
+#  needs: ['stable_gke125']
+#
+#production_specs_gke126:
+#  extends: .production_specs
+#  variables:
+#    <<: *review_gke126_common_vars
+#    VARIABLES_FILE: "variables/stable_gke126"
+#    RSPEC_TAGS: type:feature
+#  environment:
+#    name: gke126_production
+#    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
+#  resource_group: "gke126-production"
+#  needs: ['stable_gke126']
+#
+#production_specs_eks:
+#  extends: .production_specs
+#  allow_failure: true
+#  variables:
+#    <<: *review_eks_common_vars
+#    VARIABLES_FILE: "variables/stable_eks"
+#    RSPEC_TAGS: type:feature
+#  environment:
+#    name: eks_production
+#    url: https://gitlab.$KUBE_INGRESS_BASE_DOMAIN
+#  resource_group: "eks-production"
+#  needs: ['stable_eks']
 
 .qa:
   image: registry.gitlab.com/gitlab-org/gitlab-omnibus-builder/distribution_ci_tools:${CI_TOOLS_VERSION}
@@ -1003,44 +1003,44 @@ qa_gke122:
     - job: review_specs_gke122
       artifacts: false
 
-qa_gke125:
-  extends: .qa_branch
-  variables:
-    VARIABLES_FILE: "variables/review_gke125"
-    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
-  environment:
-    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    on_stop: stop_review_gke125
-  needs:
-    - review_gke125
-    - job: review_specs_gke125
-      artifacts: false
-
-qa_gke126:
-  extends: .qa_branch
-  variables:
-    VARIABLES_FILE: "variables/review_gke126"
-    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
-  environment:
-    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    on_stop: stop_review_gke126
-  needs:
-    - review_gke126
-    - job: review_specs_gke126
-      artifacts: false
-
-qa_eks:
-  extends: .qa_branch
-  variables:
-    VARIABLES_FILE: "variables/review_eks"
-    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
-  environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    on_stop: stop_review_eks
-  needs:
-    - review_eks
-    - job: review_specs_eks
-      artifacts: false
+#qa_gke125:
+#  extends: .qa_branch
+#  variables:
+#    VARIABLES_FILE: "variables/review_gke125"
+#    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
+#  environment:
+#    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    on_stop: stop_review_gke125
+#  needs:
+#    - review_gke125
+#    - job: review_specs_gke125
+#      artifacts: false
+#
+#qa_gke126:
+#  extends: .qa_branch
+#  variables:
+#    VARIABLES_FILE: "variables/review_gke126"
+#    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
+#  environment:
+#    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    on_stop: stop_review_gke126
+#  needs:
+#    - review_gke126
+#    - job: review_specs_gke126
+#      artifacts: false
+#
+#qa_eks:
+#  extends: .qa_branch
+#  variables:
+#    VARIABLES_FILE: "variables/review_eks"
+#    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
+#  environment:
+#    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    on_stop: stop_review_eks
+#  needs:
+#    - review_eks
+#    - job: review_specs_eks
+#      artifacts: false
 
 qa_gke122_production:
   extends: .qa_production
@@ -1129,60 +1129,60 @@ qa_gke122_manual_full_suite_production:
     name: gke122_production
   needs: [ "qa_gke122_full_suite_manual_trigger"]
 
-qa_gke125_full_suite_manual_trigger:
-  extends: .qa_full_suite_manual_trigger
-  script: echo 'The job will trigger Full E2E suite against GKE125'
-
-qa_gke126_full_suite_manual_trigger:
-  extends: .qa_full_suite_manual_trigger
-  script: echo 'The job will trigger Full E2E suite against GKE126'
-
-qa_gke125_manual_full_suite:
-  extends: .qa_branch
-  parallel: 7
-  variables:
-    VARIABLES_FILE: "variables/review_gke125"
-    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
-  environment:
-    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    on_stop: stop_review_gke125
-  needs: [ "qa_gke125_full_suite_manual_trigger"]
-
-qa_gke126_manual_full_suite:
-  extends: .qa_branch
-  parallel: 7
-  variables:
-    VARIABLES_FILE: "variables/review_gke126"
-    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
-  environment:
-    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    on_stop: stop_review_gke126
-  needs: [ "qa_gke126_full_suite_manual_trigger"]
-
-qa_eks_full_suite_manual_trigger:
-  extends: .qa_full_suite_manual_trigger
-  script: echo 'The job will trigger Full E2E suite against EKS'
-
-qa_eks_manual_full_suite:
-  extends: .qa_branch
-  parallel: 7
-  variables:
-    VARIABLES_FILE: "variables/review_eks"
-    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
-  environment:
-    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
-    on_stop: stop_review_eks
-  needs: [ "qa_eks_full_suite_manual_trigger"]
-
-qa_eks_manual_full_suite_production:
-  extends: .qa_production_full_suite_manual_trigger
-  parallel: 7
-  variables:
-    VARIABLES_FILE: "variables/stable_eks"
-    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
-  environment:
-    name: eks_production
-  needs: [ "qa_eks_full_suite_manual_trigger"]
+#qa_gke125_full_suite_manual_trigger:
+#  extends: .qa_full_suite_manual_trigger
+#  script: echo 'The job will trigger Full E2E suite against GKE125'
+#
+#qa_gke126_full_suite_manual_trigger:
+#  extends: .qa_full_suite_manual_trigger
+#  script: echo 'The job will trigger Full E2E suite against GKE126'
+#
+#qa_gke125_manual_full_suite:
+#  extends: .qa_branch
+#  parallel: 7
+#  variables:
+#    VARIABLES_FILE: "variables/review_gke125"
+#    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
+#  environment:
+#    name: gke125_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    on_stop: stop_review_gke125
+#  needs: [ "qa_gke125_full_suite_manual_trigger"]
+#
+#qa_gke126_manual_full_suite:
+#  extends: .qa_branch
+#  parallel: 7
+#  variables:
+#    VARIABLES_FILE: "variables/review_gke126"
+#    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
+#  environment:
+#    name: gke126_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    on_stop: stop_review_gke126
+#  needs: [ "qa_gke126_full_suite_manual_trigger"]
+#
+#qa_eks_full_suite_manual_trigger:
+#  extends: .qa_full_suite_manual_trigger
+#  script: echo 'The job will trigger Full E2E suite against EKS'
+#
+#qa_eks_manual_full_suite:
+#  extends: .qa_branch
+#  parallel: 7
+#  variables:
+#    VARIABLES_FILE: "variables/review_eks"
+#    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
+#  environment:
+#    name: eks_review/$REVIEW_REF_PREFIX$CI_COMMIT_REF_SLUG
+#    on_stop: stop_review_eks
+#  needs: [ "qa_eks_full_suite_manual_trigger"]
+#
+#qa_eks_manual_full_suite_production:
+#  extends: .qa_production_full_suite_manual_trigger
+#  parallel: 7
+#  variables:
+#    VARIABLES_FILE: "variables/stable_eks"
+#    TEST_SUITE: $QA_FULL_SUITE_OPTIONS
+#  environment:
+#    name: eks_production
+#  needs: [ "qa_eks_full_suite_manual_trigger"]
 
 knapsack-qa-report:
   image:
-- 
GitLab


From 9857525b457d9365f4bc94dc327e78c7e76fc9ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Wed, 1 Nov 2023 15:11:53 +0100
Subject: [PATCH 4/9] Fix rubocop offense

---
 spec/features/backups_spec.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/features/backups_spec.rb b/spec/features/backups_spec.rb
index 2bc90786c6..5c61f9fcc5 100644
--- a/spec/features/backups_spec.rb
+++ b/spec/features/backups_spec.rb
@@ -128,6 +128,7 @@ describe "Restoring a backup" do
       Dir.glob("/tmp/original_backup/*") do |file|
         # DEBUG: TRY TO SKIP MANIFESTS
         next if file.include? "manifests"
+
         file_path = "/tmp/test_backup/#{File.basename(file)}"
         expect(File.exist?(file_path)).to be_truthy, "#{File.basename(file)} exists in original backup but not in test ( #{file_path} )"
         # extract every tar file
-- 
GitLab


From c709ee03beabf5c6c1a766233ef54c3ab195182c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Wed, 1 Nov 2023 15:14:13 +0100
Subject: [PATCH 5/9] Adds some comment leftovers

---
 .gitlab-ci.yml | 70 +++++++++++++++++++++++++-------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84d677d111..ab2ba01b4f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1054,41 +1054,41 @@ qa_gke122_production:
     - job: production_specs_gke122
       artifacts: false
 
-qa_gke125_production:
-  extends: .qa_production
-  variables:
-    VARIABLES_FILE: "variables/stable_gke125"
-    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
-  environment:
-    name: gke125_production
-  needs:
-    - stable_gke125
-    - job: production_specs_gke125
-      artifacts: false
-
-qa_gke126_production:
-  extends: .qa_production
-  variables:
-    VARIABLES_FILE: "variables/stable_gke126"
-    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
-  environment:
-    name: gke126_production
-  needs:
-    - stable_gke126
-    - job: production_specs_gke126
-      artifacts: false
-
-qa_eks_production:
-  extends: .qa_production
-  variables:
-    VARIABLES_FILE: "variables/stable_eks"
-    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
-  environment:
-    name: eks_production
-  needs:
-    - stable_eks
-    - job: production_specs_eks
-      artifacts: false
+#qa_gke125_production:
+#  extends: .qa_production
+#  variables:
+#    VARIABLES_FILE: "variables/stable_gke125"
+#    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
+#  environment:
+#    name: gke125_production
+#  needs:
+#    - stable_gke125
+#    - job: production_specs_gke125
+#      artifacts: false
+#
+#qa_gke126_production:
+#  extends: .qa_production
+#  variables:
+#    VARIABLES_FILE: "variables/stable_gke126"
+#    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
+#  environment:
+#    name: gke126_production
+#  needs:
+#    - stable_gke126
+#    - job: production_specs_gke126
+#      artifacts: false
+#
+#qa_eks_production:
+#  extends: .qa_production
+#  variables:
+#    VARIABLES_FILE: "variables/stable_eks"
+#    TEST_SUITE: $QA_SANITY_SUITE_OPTIONS
+#  environment:
+#    name: eks_production
+#  needs:
+#    - stable_eks
+#    - job: production_specs_eks
+#      artifacts: false
 
 # QA jobs for Full E2E suites
 
-- 
GitLab


From 7bd2d8e60f3b2df6a89c097e9032313c14278146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Wed, 1 Nov 2023 15:32:09 +0100
Subject: [PATCH 6/9] Comment out Validate to speedup tests

---
 .gitlab-ci.yml | 92 +++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab2ba01b4f..42047141b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -207,35 +207,35 @@ lint_package:
     - if: '$PIPELINE_TYPE == "NIGHTLY_PIPELINE"'
   needs: ['lint_package']
 
-"Validate 1.20.7":
-  extends: .kubeconform
-  variables:
-    KUBE_VERSION: "1.20.7"
-
-"Validate 1.22.3":
-  extends: .kubeconform
-  variables:
-    KUBE_VERSION: "1.22.3"
-    HELM_SETTINGS: |
-      global:
-        ingress:
-          apiVersion: networking.k8s.io/v1
-
-"Validate 1.25.7":
-  extends: .kubeconform
-  variables:
-    KUBE_VERSION: "1.25.7"
-    HELM_SETTINGS: |
-      global:
-        ingress:
-          apiVersion: networking.k8s.io/v1
-        pdb:
-          apiVersion: policy/v1
-        hpa:
-          apiVersion: autoscaling/v2
-        batch:
-          cronJob:
-            apiVersion: batch/v1
+#"Validate 1.20.7":
+#  extends: .kubeconform
+#  variables:
+#    KUBE_VERSION: "1.20.7"
+#
+#"Validate 1.22.3":
+#  extends: .kubeconform
+#  variables:
+#    KUBE_VERSION: "1.22.3"
+#    HELM_SETTINGS: |
+#      global:
+#        ingress:
+#          apiVersion: networking.k8s.io/v1
+#
+#"Validate 1.25.7":
+#  extends: .kubeconform
+#  variables:
+#    KUBE_VERSION: "1.25.7"
+#    HELM_SETTINGS: |
+#      global:
+#        ingress:
+#          apiVersion: networking.k8s.io/v1
+#        pdb:
+#          apiVersion: policy/v1
+#        hpa:
+#          apiVersion: autoscaling/v2
+#        batch:
+#          cronJob:
+#            apiVersion: batch/v1
 
 pin_image_versions:
   stage: prepare-review
@@ -254,23 +254,23 @@ pin_image_versions:
     - if: '$PIPELINE_TYPE =~ /FEATURE_BRANCH_PIPELINE$/'
     - if: '$PIPELINE_TYPE == "QA_KNAPSACK_UPDATE_PIPELINE"'
 
-"Validate 1.26.8":
-  extends: .kubeconform
-  variables:
-    KUBE_VERSION: "1.26.8"
-    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
-
-"Validate 1.27.5":
-  extends: .kubeconform
-  variables:
-    KUBE_VERSION: "1.27.5"
-    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
-
-"Validate 1.28.3":
-  extends: .kubeconform
-  variables:
-    KUBE_VERSION: "1.28.3"
-    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
+#"Validate 1.26.8":
+#  extends: .kubeconform
+#  variables:
+#    KUBE_VERSION: "1.26.8"
+#    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
+#
+#"Validate 1.27.5":
+#  extends: .kubeconform
+#  variables:
+#    KUBE_VERSION: "1.27.5"
+#    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
+#
+#"Validate 1.28.3":
+#  extends: .kubeconform
+#  variables:
+#    KUBE_VERSION: "1.28.3"
+#    HELM_SETTINGS: !reference ["Validate 1.25.7", variables, HELM_SETTINGS]
 
 .set_up_varfile_and_kubecontext:
   script:
-- 
GitLab


From 68d8be234d9a2c114ac8e7bf14dbd1cdecd0581f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Wed, 1 Nov 2023 15:34:06 +0100
Subject: [PATCH 7/9] Comment out vcluster to speedup test

---
 .gitlab/ci/review-apps.gitlab-ci.yml | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.gitlab/ci/review-apps.gitlab-ci.yml b/.gitlab/ci/review-apps.gitlab-ci.yml
index b0f1c6d8f8..d06417bcd4 100644
--- a/.gitlab/ci/review-apps.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps.gitlab-ci.yml
@@ -40,28 +40,28 @@
 
 # Kubernetes 1.27
 
-review_vcluster_127:
-  extends: .review_app_template
-  variables:
-    VCLUSTER_K8S_VERSION: "1.27"
-    VCLUSTER_NAME: vcluster-1-27-${CI_COMMIT_REF_SLUG}
-  environment:
-    on_stop: stop_review_vcluster_127
+#review_vcluster_127:
+#  extends: .review_app_template
+#  variables:
+#    VCLUSTER_K8S_VERSION: "1.27"
+#    VCLUSTER_NAME: vcluster-1-27-${CI_COMMIT_REF_SLUG}
+#  environment:
+#    on_stop: stop_review_vcluster_127
 
-stop_review_vcluster_127:
-  extends: .stop_review_app_template
-  variables: !reference [review_vcluster_127, variables]
+#stop_review_vcluster_127:
+#  extends: .stop_review_app_template
+#  variables: !reference [review_vcluster_127, variables]
 
 # Kubernetes 1.28
 
-review_vcluster_128:
-  extends: .review_app_template
-  variables:
-    VCLUSTER_K8S_VERSION: "1.28"
-    VCLUSTER_NAME: vcluster-1-28-${CI_COMMIT_REF_SLUG}
-  environment:
-    on_stop: stop_review_vcluster_128
+#review_vcluster_128:
+#  extends: .review_app_template
+#  variables:
+#    VCLUSTER_K8S_VERSION: "1.28"
+#    VCLUSTER_NAME: vcluster-1-28-${CI_COMMIT_REF_SLUG}
+#  environment:
+#    on_stop: stop_review_vcluster_128
 
-stop_review_vcluster_128:
-  extends: .stop_review_app_template
-  variables: !reference [review_vcluster_128, variables]
+#stop_review_vcluster_128:
+#  extends: .stop_review_app_template
+#  variables: !reference [review_vcluster_128, variables]
-- 
GitLab


From 5f734048e1b9181a1ca538f4afd137d8fc72b5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Thu, 2 Nov 2023 21:03:44 +0100
Subject: [PATCH 8/9] Test new 16.6.0-pre backup

---
 .gitlab-ci.yml                | 2 +-
 spec/features/backups_spec.rb | 8 --------
 spec/gitlab_test_helper.rb    | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 42047141b9..6772988ed3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,7 +37,7 @@ variables:
   # AUTO_DEVOPS_DOMAIN: domain.example.com
   GIT_CLONE_PATH: $CI_BUILDS_DIR/gitlab
   HELM_MAX_HISTORY: 20
-  TEST_BACKUP_PREFIX: "16.1.0"
+  TEST_BACKUP_PREFIX: "16.6.0-pre"
   NAMESPACE: $KUBE_NAMESPACE
   REVIEW_REF_PREFIX: ""
   ISSUE_BOT_LABELS_EXTRA: "group::distribution,type::maintenance,maintenance::pipelines"
diff --git a/spec/features/backups_spec.rb b/spec/features/backups_spec.rb
index 5c61f9fcc5..4adcd41323 100644
--- a/spec/features/backups_spec.rb
+++ b/spec/features/backups_spec.rb
@@ -120,15 +120,7 @@ describe "Restoring a backup" do
       stdout, status = Open3.capture2e(cmd)
       expect(status.success?).to be(true), "Error unarchiving generated backup: #{stdout}"
 
-      pp 'DEBGUG: ORIGINAL BACKUP'
-      pp Dir.glob("/tmp/original_backup/*")
-      pp 'DEBGUG: TEST GENERATED BACKUP'
-      pp Dir.glob("/tmp/test_backup/*")
-
       Dir.glob("/tmp/original_backup/*") do |file|
-        # DEBUG: TRY TO SKIP MANIFESTS
-        next if file.include? "manifests"
-
         file_path = "/tmp/test_backup/#{File.basename(file)}"
         expect(File.exist?(file_path)).to be_truthy, "#{File.basename(file)} exists in original backup but not in test ( #{file_path} )"
         # extract every tar file
diff --git a/spec/gitlab_test_helper.rb b/spec/gitlab_test_helper.rb
index 0298b19b1d..ae61434386 100644
--- a/spec/gitlab_test_helper.rb
+++ b/spec/gitlab_test_helper.rb
@@ -282,7 +282,7 @@ module Gitlab
     end
 
     def ensure_backups_on_object_storage
-      storage_url = 'https://storage.googleapis.com/gitlab-charts-ci/test-backups'
+      storage_url = 'https://storage.cloud.google.com/test-backups-chart-issue-5074'
       backup_file_names = ["#{ENV['TEST_BACKUP_PREFIX']}_gitlab_backup.tar"]
       backup_file_names.each do |file_name|
         file = URI.open("#{storage_url}/#{file_name}").read
-- 
GitLab


From f20f902cd843d26d54f0ffd4371ced83cc8e0776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Cunha?= <j.a.cunha@gmail.com>
Date: Thu, 2 Nov 2023 21:26:47 +0100
Subject: [PATCH 9/9] Bring storage endpoing back to official one

---
 spec/gitlab_test_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/gitlab_test_helper.rb b/spec/gitlab_test_helper.rb
index ae61434386..0298b19b1d 100644
--- a/spec/gitlab_test_helper.rb
+++ b/spec/gitlab_test_helper.rb
@@ -282,7 +282,7 @@ module Gitlab
     end
 
     def ensure_backups_on_object_storage
-      storage_url = 'https://storage.cloud.google.com/test-backups-chart-issue-5074'
+      storage_url = 'https://storage.googleapis.com/gitlab-charts-ci/test-backups'
       backup_file_names = ["#{ENV['TEST_BACKUP_PREFIX']}_gitlab_backup.tar"]
       backup_file_names.each do |file_name|
         file = URI.open("#{storage_url}/#{file_name}").read
-- 
GitLab