Add latest changes from gitlab-org/gitlab@master

7 files changed, 4 insertions, 60 deletions

diff --git a/.gitlab/ci/as-if-jh.gitlab-ci.yml b/.gitlab/ci/as-if-jh.gitlab-ci.yml
index 768c7df0219..7680bc6eac3 100644
--- a/.gitlab/ci/as-if-jh.gitlab-ci.yml
+++ b/.gitlab/ci/as-if-jh.gitlab-ci.yml
@@ -10,7 +10,7 @@ add-jh-files:
   extends:
     - .shared-as-if-jh
     - .as-if-jh:rules:prepare-as-if-jh
-  image: ${GITLAB_DEPENDENCY_PROXY}ruby:${RUBY_VERSION}
+  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}
   stage: prepare
   before_script:
     - source ./scripts/utils.sh
diff --git a/.gitlab/ci/caching.gitlab-ci.yml b/.gitlab/ci/caching.gitlab-ci.yml
index 6a13fc3c56f..fba2efc46e4 100644
--- a/.gitlab/ci/caching.gitlab-ci.yml
+++ b/.gitlab/ci/caching.gitlab-ci.yml
@@ -56,7 +56,7 @@ packages-cleanup:
   extends:
     - .default-retry
     - .caching:rules:packages-cleanup
-  image: ${GITLAB_DEPENDENCY_PROXY}ruby:${RUBY_VERSION}
+  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}
   stage: prepare
   before_script:
     - source scripts/utils.sh
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
index 68c3d5a6706..44b28d28734 100644
--- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml
+++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
@@ -625,11 +625,6 @@ e2e-test-report:
     ALLURE_MERGE_REQUEST_IID: $CI_MERGE_REQUEST_IID
     ALLURE_JOB_NAME: e2e-package-and-test
     GIT_STRATEGY: none
-  artifacts:  # save rspec results for displaying in parent pipeline
-    expire_in: 1 day
-    when: always
-    paths:
-      - gitlab-qa-run-*/**/rspec-*.xml
 
 upload-knapsack-report:
   extends:
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index f6668d7864e..2864014e17e 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -89,25 +89,3 @@ e2e:package-and-test:
     include:
       - artifact: package-and-test-pipeline.yml
         job: e2e-test-pipeline-generate
-
-# Fetch child pipeline test results and store in parent pipeline
-# workaround until natively implemented: https://gitlab.com/groups/gitlab-org/-/epics/8205
-e2e:package-and-test-results:
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
-  extends:
-    - .qa-job-base
-    - .qa:rules:package-and-test
-  stage: qa
-  needs:
-    - e2e:package-and-test
-  variables:
-    COLORIZED_LOGS: "true"
-    QA_LOG_LEVEL: "debug"
-  when: always
-  allow_failure: true
-  script:
-    - bundle exec rake "ci:download_test_results[e2e:package-and-test,e2e-test-report,${CI_PROJECT_DIR}]"
-  artifacts:
-    when: always
-    reports:
-      junit: gitlab-qa-run-*/**/rspec-*.xml
diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml
index 41f36215045..da3a2afcbb6 100644
--- a/.gitlab/ci/review-apps/main.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml
@@ -32,7 +32,7 @@ review-build-cng-env:
   extends:
     - .default-retry
     - .review:rules:review-build-cng
-  image: ${GITLAB_DEPENDENCY_PROXY}ruby:${RUBY_VERSION}-alpine3.16
+  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}-alpine3.16
   stage: prepare
   needs:
     # We need this job because we need its `cached-assets-hash.txt` artifact, so that we can pass the assets image tag to the downstream CNG pipeline.
@@ -108,7 +108,7 @@ review-deploy:
     - .review-workflow-base
     - .review:rules:review-deploy
   stage: deploy
-  image: ${GITLAB_DEPENDENCY_PROXY}dtzar/helm-kubectl:3.10.3
+  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}dtzar/helm-kubectl:3.10.3
   needs:
     - review-build-cng
     - review-delete-deployment # We always want to start from a clean slate (i.e. no helm release, no k8s namespace)
diff --git a/.gitlab/ci/review-apps/qa.gitlab-ci.yml b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
index 01a738127f7..912df0ede29 100644
--- a/.gitlab/ci/review-apps/qa.gitlab-ci.yml
+++ b/.gitlab/ci/review-apps/qa.gitlab-ci.yml
@@ -147,11 +147,6 @@ e2e-test-report:
     GIT_STRATEGY: none
   allow_failure: true
   when: always
-  artifacts:  # re-save rspec results for displaying in parent pipeline
-    expire_in: 1 day
-    when: always
-    paths:
-      - qa/tmp/rspec-*.xml
 
 upload-knapsack-report:
   extends:
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index c331671d180..20e4dec7dbf 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -88,30 +88,6 @@ start-review-app-pipeline:
       - artifact: review-app-pipeline.yml
         job: e2e-test-pipeline-generate
 
-# Fetch child pipeline test results and store in parent pipeline
-# workaround until natively implemented: https://gitlab.com/groups/gitlab-org/-/epics/8205
-review-app-test-results:
-  image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
-  stage: review
-  extends:
-    - .qa-cache
-    - .review:rules:start-review-app-pipeline
-  needs:
-    - start-review-app-pipeline
-  variables:
-    COLORIZED_LOGS: "true"
-    QA_LOG_LEVEL: "debug"
-  before_script:
-    - cd qa && bundle install
-  script:
-    - bundle exec rake "ci:download_test_results[start-review-app-pipeline,e2e-test-report,${CI_PROJECT_DIR}]"
-  when: always
-  allow_failure: true
-  artifacts:
-    when: always
-    reports:
-      junit: qa/tmp/rspec-*.xml
-
 danger-review:
   extends:
     - .default-retry