From 2c03443729f6d1bf0b2851ef71c0303a18127976 Mon Sep 17 00:00:00 2001 From: Jennifer Louie Date: Mon, 21 Dec 2020 16:02:55 +0000 Subject: [PATCH 1/3] Set runner tag for ee:geo to gitlab-org-docker --- .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20c23230..7040ff9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,13 +59,10 @@ rubocop: rspec: extends: .check-base -.test: +.test-common: stage: test services: - docker:19.03.0-dind - tags: - - gitlab-org - - docker artifacts: when: always expire_in: 10d @@ -81,6 +78,16 @@ rspec: - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi - exit $test_run_exit_code +.common-tags: + tags: + - gitlab-org + - docker + +.test: + extends: + .test-common + .common-tags + .ce-qa: variables: DEFAULT_RELEASE: "CE" @@ -462,22 +469,24 @@ ee:mattermost-quarantine: QA_SCENARIO: "Test::Integration::Mattermost" # Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/gitlab/-/issues/273063 -# ee:geo: -# extends: -# - .test -# - .ee-qa -# - .rspec-report-opts -# variables: -# QA_SCENARIO: "Test::Integration::Geo" - -# ee:geo-quarantine: -# extends: -# - .test -# - .ee-qa -# - .quarantine -# - .rspec-report-opts -# variables: -# QA_SCENARIO: "Test::Integration::Geo" +ee:geo: + extends: + - .test-common + - .ee-qa + - .rspec-report-opts + tags: + - gitlab-org-docker + variables: + QA_SCENARIO: "Test::Integration::Geo" + +.ee:geo-quarantine: + extends: + - .test + - .ee-qa + - .quarantine + - .rspec-report-opts + variables: + QA_SCENARIO: "Test::Integration::Geo" ce:ldap_no_tls: extends: -- GitLab From 2082d728a003c0750e9da882c12ff69009233236 Mon Sep 17 00:00:00 2001 From: Jennifer Louie Date: Mon, 21 Dec 2020 16:06:07 +0000 Subject: [PATCH 2/3] Fix typo --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7040ff9b..de96e972 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,8 +85,8 @@ rspec: .test: extends: - .test-common - .common-tags + - .test-common + - .common-tags .ce-qa: variables: -- GitLab From fc8beea452d2ded54370c3aac1213d7ed05bfd86 Mon Sep 17 00:00:00 2001 From: Jennifer Louie Date: Tue, 22 Dec 2020 15:33:29 +0000 Subject: [PATCH 3/3] Run ee:geo only for test --- .gitlab-ci.yml | 1532 ++++++++++++++++++++++++------------------------ 1 file changed, 766 insertions(+), 766 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de96e972..84a55e18 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -157,316 +157,316 @@ rspec: variables: QA_RSPEC_TAGS: "--tag quarantine" -ce:sanity-framework: - script: - - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure" - extends: - - .test - - .high-capacity - - .ce-qa - -ee:sanity-framework: - script: - - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "2 examples, 1 failure" - extends: - - .test - - .high-capacity - - .ee-qa - -# The custom jobs are for manually running specific/alternative tests in MRs, so we don't report them in issues -ce:custom-parallel: - script: - - 'echo "Running: exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"' - - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - allow_failure: true - parallel: 10 - -ee:custom-parallel: - script: - - 'echo "Running: exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"' - - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - allow_failure: true - parallel: 10 - -ce:instance: - extends: - - .test - - .high-capacity - - .ce-qa - - .knapsack-variables - - .rspec-report-opts - parallel: 5 - -ce:instance-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" - -ee:instance: - extends: - - .test - - .high-capacity - - .ee-qa - - .knapsack-variables - - .rspec-report-opts - parallel: 5 - -ee:instance-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" - -ce:relative_url: - extends: - - .test - - .high-capacity - - .ce-qa - - .knapsack-variables - - .rspec-report-opts - parallel: 5 - variables: - QA_SCENARIO: "Test::Instance::RelativeUrl" - -ce:relative_url-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Instance::RelativeUrl" - QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" - -ee:relative_url: - extends: - - .test - - .high-capacity - - .ee-qa - - .knapsack-variables - - .rspec-report-opts - parallel: 5 - variables: - QA_SCENARIO: "Test::Instance::RelativeUrl" - -ee:relative_url-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Instance::RelativeUrl" - QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" - -ce:repository_storage: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Instance::RepositoryStorage" - -ce:repository_storage-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Instance::RepositoryStorage" - -ee:repository_storage: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Instance::RepositoryStorage" - -ee:repository_storage-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Instance::RepositoryStorage" - -# The Test::Omnibus::Image scenarios don't run the E2E tests so they don't need to report test results -ce:image: - script: - - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=CE} - extends: - - .test - - .ce-qa - -ee:image: - script: - - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=EE} - extends: - - .test - - .ee-qa - -# The Test::Omnibus::Update scenarios require the release to be specified twice, which can't be done dynamically using the `variables` parameter -# So instead we include the script here again, with two release variables -ce:update: - script: - - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS || test_run_exit_code=$? - - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" - - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi - - exit $test_run_exit_code - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - - .knapsack-variables - parallel: 5 - -ce:update-quarantine: - script: - - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS || test_run_exit_code=$? - - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" - - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi - - exit $test_run_exit_code - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - -ee:update: - script: - - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS || test_run_exit_code=$? - - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" - - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi - - exit $test_run_exit_code - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - - .knapsack-variables - parallel: 5 - -ee:update-quarantine: - script: - - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS || test_run_exit_code=$? - - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" - - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi - - exit $test_run_exit_code - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - -# The Test::Omnibus::Upgrade scenario isn't run on master (because it always uses the latest CE/EE image) so we don't report the test results in issues -ce:upgrade: - script: - - exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS - extends: - - .test - - .high-capacity - - .only-qa - - .rspec-report-opts - - .knapsack-variables - parallel: 5 - -ce:upgrade-quarantine: - script: - - exe/gitlab-qa Test::Omnibus::Upgrade CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS - extends: - - .test - - .high-capacity - - .only-qa - - .quarantine - - .rspec-report-opts - -ee-previous-to-ce:update: - script: - - exe/gitlab-qa Test::Omnibus::Update EE CE -- $RSPEC_REPORT_OPTS - extends: - - .test - - .high-capacity - - .only-qa - - .rspec-report-opts - -ee-previous-to-ce:update-quarantine: - script: - - exe/gitlab-qa Test::Omnibus::Update EE CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS - extends: - - .test - - .high-capacity - - .only-qa - - .quarantine - - .rspec-report-opts - -ce:mattermost: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" - -ce:mattermost-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" - -ee:mattermost: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" - -ee:mattermost-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" +# ce:sanity-framework: +# script: +# - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=CE} -- --tag framework" 1 "2 examples, 1 failure" +# extends: +# - .test +# - .high-capacity +# - .ce-qa + +# ee:sanity-framework: +# script: +# - ./bin/expect_exit_code_and_text "exe/gitlab-qa Test::Instance::Image ${RELEASE:=EE} -- --tag framework" 1 "2 examples, 1 failure" +# extends: +# - .test +# - .high-capacity +# - .ee-qa + +# # The custom jobs are for manually running specific/alternative tests in MRs, so we don't report them in issues +# ce:custom-parallel: +# script: +# - 'echo "Running: exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"' +# - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# allow_failure: true +# parallel: 10 + +# ee:custom-parallel: +# script: +# - 'echo "Running: exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS"' +# - exe/gitlab-qa ${QA_SCENARIO:=Test::Instance::Image} ${RELEASE:=$DEFAULT_RELEASE} $GITLAB_QA_OPTS -- $QA_TESTS $QA_RSPEC_TAGS $RSPEC_REPORT_OPTS +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# allow_failure: true +# parallel: 10 + +# ce:instance: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 + +# ce:instance-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" + +# ee:instance: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 + +# ee:instance-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" + +# ce:relative_url: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 +# variables: +# QA_SCENARIO: "Test::Instance::RelativeUrl" + +# ce:relative_url-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RelativeUrl" +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" + +# ee:relative_url: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 +# variables: +# QA_SCENARIO: "Test::Instance::RelativeUrl" + +# ee:relative_url-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RelativeUrl" +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" + +# ce:repository_storage: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" + +# ce:repository_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" + +# ee:repository_storage: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" + +# ee:repository_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" + +# # The Test::Omnibus::Image scenarios don't run the E2E tests so they don't need to report test results +# ce:image: +# script: +# - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=CE} +# extends: +# - .test +# - .ce-qa + +# ee:image: +# script: +# - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=EE} +# extends: +# - .test +# - .ee-qa + +# # The Test::Omnibus::Update scenarios require the release to be specified twice, which can't be done dynamically using the `variables` parameter +# # So instead we include the script here again, with two release variables +# ce:update: +# script: +# - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- $RSPEC_REPORT_OPTS || test_run_exit_code=$? +# - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" +# - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi +# - exit $test_run_exit_code +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# - .knapsack-variables +# parallel: 5 + +# ce:update-quarantine: +# script: +# - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=CE} ${RELEASE:=CE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS || test_run_exit_code=$? +# - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" +# - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi +# - exit $test_run_exit_code +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts + +# ee:update: +# script: +# - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- $RSPEC_REPORT_OPTS || test_run_exit_code=$? +# - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" +# - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi +# - exit $test_run_exit_code +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# - .knapsack-variables +# parallel: 5 + +# ee:update-quarantine: +# script: +# - exe/gitlab-qa Test::Omnibus::Update ${RELEASE:=EE} ${RELEASE:=EE} -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS || test_run_exit_code=$? +# - export GITLAB_QA_ACCESS_TOKEN="$GITLAB_QA_PRODUCTION_ACCESS_TOKEN" +# - if [ "$TOP_UPSTREAM_SOURCE_REF" == $TOP_UPSTREAM_DEFAULT_BRANCH ] || [[ "$TOP_UPSTREAM_SOURCE_JOB" == https://ops.gitlab.net* ]]; then exe/gitlab-qa-report --report-in-issues "gitlab-qa-run-*/**/rspec-*.json" --project "$QA_TESTCASES_REPORTING_PROJECT" || true; fi +# - exit $test_run_exit_code +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts + +# # The Test::Omnibus::Upgrade scenario isn't run on master (because it always uses the latest CE/EE image) so we don't report the test results in issues +# ce:upgrade: +# script: +# - exe/gitlab-qa Test::Omnibus::Upgrade CE -- $RSPEC_REPORT_OPTS +# extends: +# - .test +# - .high-capacity +# - .only-qa +# - .rspec-report-opts +# - .knapsack-variables +# parallel: 5 + +# ce:upgrade-quarantine: +# script: +# - exe/gitlab-qa Test::Omnibus::Upgrade CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS +# extends: +# - .test +# - .high-capacity +# - .only-qa +# - .quarantine +# - .rspec-report-opts + +# ee-previous-to-ce:update: +# script: +# - exe/gitlab-qa Test::Omnibus::Update EE CE -- $RSPEC_REPORT_OPTS +# extends: +# - .test +# - .high-capacity +# - .only-qa +# - .rspec-report-opts + +# ee-previous-to-ce:update-quarantine: +# script: +# - exe/gitlab-qa Test::Omnibus::Update EE CE -- --tag quarantine --tag ~orchestrated $RSPEC_REPORT_OPTS +# extends: +# - .test +# - .high-capacity +# - .only-qa +# - .quarantine +# - .rspec-report-opts + +# ce:mattermost: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Mattermost" + +# ce:mattermost-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Mattermost" + +# ee:mattermost: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Mattermost" + +# ee:mattermost-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Mattermost" # Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/gitlab/-/issues/273063 ee:geo: @@ -479,462 +479,462 @@ ee:geo: variables: QA_SCENARIO: "Test::Integration::Geo" -.ee:geo-quarantine: - extends: - - .test - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Geo" - -ce:ldap_no_tls: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" - -ce:ldap_no_tls-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" - -ee:ldap_no_tls: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" - -ee:ldap_no_tls-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" - -ce:ldap_tls: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" - -ce:ldap_tls-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" - -ee:ldap_tls: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" - -ee:ldap_tls-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" - -ee:ldap_no_server: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoServer" - -ee:ldap_no_server-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoServer" - -ce:instance_saml: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" - -ce:instance_saml-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" - -ee:instance_saml: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" - -ee:instance_saml-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" - -ee:group_saml: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GroupSAML" - -ee:group_saml-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GroupSAML" - -ce:kubernetes: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - allow_failure: true - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" - -ce:kubernetes-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" - -ee:kubernetes: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - allow_failure: true - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" - -ee:kubernetes-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" - -ce:object_storage: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" - -ce:object_storage-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" - -ee:object_storage: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" - -ee:object_storage-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" - -ee:packages: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Packages" - -ee:packages-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Packages" - -ce:actioncable: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" - -ce:actioncable-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" - -ee:actioncable: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" - -ee:actioncable-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" - -ee:elasticsearch: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Elasticsearch" - -ee:elasticsearch-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Elasticsearch" - -ce:praefect: - extends: - - .test - - .high-capacity - - .ce-qa - - .knapsack-variables - - .rspec-report-opts - parallel: 5 - variables: - QA_SCENARIO: "Test::Integration::Praefect" - QA_CAN_TEST_PRAEFECT: "true" - -ce:praefect-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Praefect" - QA_CAN_TEST_PRAEFECT: "true" - QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" - -ee:praefect: - extends: - - .test - - .high-capacity - - .ee-qa - - .knapsack-variables - - .rspec-report-opts - parallel: 5 - variables: - QA_SCENARIO: "Test::Integration::Praefect" - QA_CAN_TEST_PRAEFECT: "true" - -ee:praefect-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Praefect" - QA_CAN_TEST_PRAEFECT: "true" - QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" - -ce:gitaly-cluster: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" - -ce:gitaly-cluster-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" - -ee:gitaly-cluster: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" - -ee:gitaly-cluster-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" - -ce:smtp: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::SMTP" - -ee:smtp: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::SMTP" - -ce:jira: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" - -ce:jira-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" - -ee:jira: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" - -ee:jira-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" +# .ee:geo-quarantine: +# extends: +# - .test +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Geo" + +# ce:ldap_no_tls: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" + +# ce:ldap_no_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" + +# ee:ldap_no_tls: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" + +# ee:ldap_no_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" + +# ce:ldap_tls: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" + +# ce:ldap_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" + +# ee:ldap_tls: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" + +# ee:ldap_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" + +# ee:ldap_no_server: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoServer" + +# ee:ldap_no_server-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoServer" + +# ce:instance_saml: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" + +# ce:instance_saml-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" + +# ee:instance_saml: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" + +# ee:instance_saml-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" + +# ee:group_saml: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GroupSAML" + +# ee:group_saml-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GroupSAML" + +# ce:kubernetes: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# allow_failure: true +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" + +# ce:kubernetes-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" + +# ee:kubernetes: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# allow_failure: true +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" + +# ee:kubernetes-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" + +# ce:object_storage: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" + +# ce:object_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" + +# ee:object_storage: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" + +# ee:object_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" + +# ee:packages: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Packages" + +# ee:packages-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Packages" + +# ce:actioncable: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Actioncable" + +# ce:actioncable-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Actioncable" + +# ee:actioncable: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Actioncable" + +# ee:actioncable-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Actioncable" + +# ee:elasticsearch: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Elasticsearch" + +# ee:elasticsearch-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Elasticsearch" + +# ce:praefect: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 +# variables: +# QA_SCENARIO: "Test::Integration::Praefect" +# QA_CAN_TEST_PRAEFECT: "true" + +# ce:praefect-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Praefect" +# QA_CAN_TEST_PRAEFECT: "true" +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" + +# ee:praefect: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 +# variables: +# QA_SCENARIO: "Test::Integration::Praefect" +# QA_CAN_TEST_PRAEFECT: "true" + +# ee:praefect-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Praefect" +# QA_CAN_TEST_PRAEFECT: "true" +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" + +# ce:gitaly-cluster: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GitalyCluster" + +# ce:gitaly-cluster-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GitalyCluster" + +# ee:gitaly-cluster: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GitalyCluster" + +# ee:gitaly-cluster-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GitalyCluster" + +# ce:smtp: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::SMTP" + +# ee:smtp: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::SMTP" + +# ce:jira: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Jira" + +# ce:jira-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Jira" + +# ee:jira: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Jira" + +# ee:jira-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Jira" # This job requires the `GITLAB_QA_ACCESS_TOKEN` and `GITLAB_QA_DEV_ACCESS_TOKEN` # variable to be passed when triggered. -- GitLab