diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20c232302ce559b725c32a3a868c69a00ee4047f..84a55e18bee504cebd172943826947bb657b7cb8 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" @@ -150,782 +157,784 @@ 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 +# 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: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 +# 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 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 +# # 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 -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: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 -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 +# ce:instance: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 -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:instance-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" -ce:mattermost: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" +# ee:instance: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 -ce:mattermost-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" +# ee:instance-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" -ee:mattermost: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" +# ce:relative_url: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .knapsack-variables +# - .rspec-report-opts +# parallel: 5 +# variables: +# QA_SCENARIO: "Test::Instance::RelativeUrl" -ee:mattermost-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Mattermost" +# 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" -# Disabling geo jobs temporarily due to https://gitlab.com/gitlab-org/gitlab/-/issues/273063 -# ee:geo: +# ee:relative_url: # extends: # - .test +# - .high-capacity # - .ee-qa +# - .knapsack-variables # - .rspec-report-opts +# parallel: 5 # variables: -# QA_SCENARIO: "Test::Integration::Geo" +# QA_SCENARIO: "Test::Instance::RelativeUrl" -# ee:geo-quarantine: +# ee:relative_url-quarantine: # extends: # - .test +# - .high-capacity # - .ee-qa # - .quarantine # - .rspec-report-opts # variables: -# QA_SCENARIO: "Test::Integration::Geo" +# QA_SCENARIO: "Test::Instance::RelativeUrl" +# QA_RSPEC_TAGS: "--tag quarantine --tag ~orchestrated" -ce:ldap_no_tls: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" +# ce:repository_storage: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" -ce:ldap_no_tls-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" +# ce:repository_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" -ee:ldap_no_tls: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" +# ee:repository_storage: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" -ee:ldap_no_tls-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoTLS" +# ee:repository_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Instance::RepositoryStorage" -ce:ldap_tls: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" +# # 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 -ce:ldap_tls-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" +# ee:image: +# script: +# - exe/gitlab-qa Test::Omnibus::Image ${RELEASE:=EE} +# extends: +# - .test +# - .ee-qa -ee:ldap_tls: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" +# # 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:ldap_tls-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPTLS" +# 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 -ee:ldap_no_server: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoServer" +# # 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 -ee:ldap_no_server-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::LDAPNoServer" +# 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 -ce:instance_saml: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" +# 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 -ce:instance_saml-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" +# 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 -ee:instance_saml: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" +# ce:mattermost: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Mattermost" -ee:instance_saml-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::InstanceSAML" +# ce:mattermost-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Mattermost" -ee:group_saml: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GroupSAML" +# ee:mattermost: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Mattermost" -ee:group_saml-quarantine: +# 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: extends: - - .test - - .high-capacity + - .test-common - .ee-qa - - .quarantine - .rspec-report-opts + tags: + - gitlab-org-docker variables: - QA_SCENARIO: "Test::Integration::GroupSAML" + QA_SCENARIO: "Test::Integration::Geo" -ce:kubernetes: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - allow_failure: true - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" +# .ee:geo-quarantine: +# extends: +# - .test +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Geo" -ce:kubernetes-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" +# ce:ldap_no_tls: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" -ee:kubernetes: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - allow_failure: true - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" +# ce:ldap_no_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" -ee:kubernetes-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Kubernetes" +# ee:ldap_no_tls: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" -ce:object_storage: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" +# ee:ldap_no_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoTLS" -ce:object_storage-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" +# ce:ldap_tls: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" -ee:object_storage: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" +# ce:ldap_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" -ee:object_storage-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::ObjectStorage" +# ee:ldap_tls: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" -ee:packages: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Packages" +# ee:ldap_tls-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPTLS" -ee:packages-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Packages" +# ee:ldap_no_server: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoServer" -ce:actioncable: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" +# ee:ldap_no_server-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::LDAPNoServer" -ce:actioncable-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" +# ce:instance_saml: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" -ee:actioncable: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" +# ce:instance_saml-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" -ee:actioncable-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Actioncable" +# ee:instance_saml: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" -ee:elasticsearch: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Elasticsearch" +# ee:instance_saml-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::InstanceSAML" -ee:elasticsearch-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Elasticsearch" +# ee:group_saml: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GroupSAML" -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" +# ee:group_saml-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::GroupSAML" -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" +# ce:kubernetes: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# allow_failure: true +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" -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" +# ce:kubernetes-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" -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" +# ee:kubernetes: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# allow_failure: true +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" -ce:gitaly-cluster: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" +# ee:kubernetes-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Kubernetes" -ce:gitaly-cluster-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" +# ce:object_storage: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" -ee:gitaly-cluster: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" +# ce:object_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" -ee:gitaly-cluster-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::GitalyCluster" +# ee:object_storage: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" -ce:smtp: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::SMTP" +# ee:object_storage-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::ObjectStorage" -ee:smtp: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::SMTP" +# ee:packages: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Packages" -ce:jira: - extends: - - .test - - .high-capacity - - .ce-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" +# ee:packages-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ee-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Packages" -ce:jira-quarantine: - extends: - - .test - - .high-capacity - - .ce-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" +# ce:actioncable: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Actioncable" -ee:jira: - extends: - - .test - - .high-capacity - - .ee-qa - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" +# ce:actioncable-quarantine: +# extends: +# - .test +# - .high-capacity +# - .ce-qa +# - .quarantine +# - .rspec-report-opts +# variables: +# QA_SCENARIO: "Test::Integration::Actioncable" -ee:jira-quarantine: - extends: - - .test - - .high-capacity - - .ee-qa - - .quarantine - - .rspec-report-opts - variables: - QA_SCENARIO: "Test::Integration::Jira" +# 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.