diff options
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index 6d181a59214..eae3b2f2a36 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -15,10 +15,6 @@ .e2e-trigger-base: extends: .production # this makes sure GITLAB_ALLOW_SEPARATE_CI_DATABASE is passed to the child pipeline stage: qa - needs: - - build-assets-image - - build-qa-image - - e2e-test-pipeline-generate variables: # This is needed by `trigger-omnibus-env` (`.gitlab/ci/package-and-test/main.gitlab-ci.yml`). PARENT_PIPELINE_ID: $CI_PIPELINE_ID @@ -27,7 +23,6 @@ RUN_WITH_BUNDLE: "true" # instructs pipeline to install and run gitlab-qa gem via bundler QA_PATH: qa # sets the optional path for bundler to run from DYNAMIC_PIPELINE_YML: package-and-test-pipeline.yml # yml files are generated by scripts/generate-e2e-pipeline script - EXTRA_GITLAB_QA_OPTS: --set-feature-flags super_sidebar_nav_enrolled=enabled inherit: variables: - CHROME_VERSION @@ -36,9 +31,6 @@ - DEBIAN_VERSION - REGISTRY_GROUP - REGISTRY_HOST - - OMNIBUS_GITLAB_CACHE_EDITION - - OMNIBUS_GITLAB_RUBY3_BUILD - - OMNIBUS_GITLAB_RUBY2_BUILD trigger: strategy: depend forward: @@ -102,9 +94,9 @@ trigger-omnibus: TOP_UPSTREAM_SOURCE_PROJECT: $CI_PROJECT_PATH SECURITY_SOURCES: $SECURITY_SOURCES CACHE_UPDATE: $OMNIBUS_GITLAB_CACHE_UPDATE - RUBY3_BUILD: $OMNIBUS_GITLAB_RUBY3_BUILD - RUBY2_BUILD: $OMNIBUS_GITLAB_RUBY2_BUILD - CACHE_EDITION: $OMNIBUS_GITLAB_CACHE_EDITION + USE_OLD_RUBY_VERSION: "true" + CACHE_EDITION: "GITLAB_RUBY3_0" + NEXT_RUBY_VERSION: "3.1.4" BUILD_ON_ALL_OS: $OMNIBUS_GITLAB_BUILD_ON_ALL_OS SKIP_QA_TEST: "true" ee: $EE @@ -135,7 +127,6 @@ e2e:package-and-test-ee: variables: RELEASE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ee:${CI_COMMIT_SHA}" QA_RUN_TYPE: e2e-package-and-test - ALLURE_JOB_NAME: e2e-package-and-test PIPELINE_NAME: E2E Omnibus GitLab EE e2e:package-and-test-ce: @@ -151,17 +142,19 @@ e2e:package-and-test-ce: RELEASE: ${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ce:${CI_COMMIT_SHA} GITLAB_QA_IMAGE: ${CI_REGISTRY_IMAGE}/gitlab-ce-qa:${CI_COMMIT_SHA} QA_RUN_TYPE: e2e-package-and-test-ce - ALLURE_JOB_NAME: e2e-package-and-test-ce PIPELINE_NAME: E2E Omnibus GitLab CE e2e:package-and-test-old-nav: extends: - .e2e-trigger-base - .qa:rules:package-and-test-old-nav + needs: + - build-qa-image + - trigger-omnibus + - e2e-test-pipeline-generate variables: RELEASE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ee:${CI_COMMIT_SHA}" QA_RUN_TYPE: e2e-package-and-test-old-nav - ALLURE_JOB_NAME: e2e-package-and-test-old-nav PIPELINE_NAME: E2E Omnibus Old Navigation QA_SUPER_SIDEBAR_ENABLED: "false" EXTRA_GITLAB_QA_OPTS: "" @@ -177,7 +170,6 @@ e2e:package-and-test-nightly: variables: GITLAB_SEMVER_VERSION: $GITLAB_SEMVER_VERSION QA_RUN_TYPE: nightly - ALLURE_JOB_NAME: nightly PIPELINE_NAME: E2E Omnibus GitLab Nightly DYNAMIC_PIPELINE_YML: package-and-test-nightly-pipeline.yml @@ -190,7 +182,6 @@ e2e:test-on-gdk: - build-gdk-image - e2e-test-pipeline-generate variables: - ALLURE_JOB_NAME: e2e-test-on-gdk QA_RUN_TYPE: e2e-test-on-gdk PIPELINE_NAME: E2E GDK DYNAMIC_PIPELINE_YML: test-on-gdk-pipeline.yml |