From d3e26297d01b7762879808322107d688f8e5c4e8 Mon Sep 17 00:00:00 2001 From: treagitlab Date: Tue, 16 Dec 2025 17:37:21 -0800 Subject: [PATCH 1/2] Remove duplicate test suites in test pipelines --- .gitlab/ci/rules.gitlab-ci.yml | 1 - .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 16 +++--- .gitlab/ci/test-on-omnibus/main.gitlab-ci.yml | 54 ------------------- qa/qa/scenario/test/instance/all.rb | 4 +- qa/qa/scenario/test/instance/create.rb | 2 +- qa/qa/scenario/test/integration/registry.rb | 2 +- 6 files changed, 12 insertions(+), 67 deletions(-) diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 95102b34b12388..09a25b9440e4d6 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -2093,7 +2093,6 @@ DEPENDENCY_UPDATE: "true" - <<: *if-merge-request changes: *code-qa-patterns - when: manual allow_failure: true variables: MR_CODE_PATTERNS: "true" diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index 18cf745f1d01c7..9eb04eaf30fcae 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -82,26 +82,26 @@ workflow: expire_in: 7 days when: always -# ========================================== -# Test stage -# ========================================== - -gdk-instance: +.gdk-instance: extends: - .gdk-qa-base - .with-parallel variables: QA_SCENARIO: Test::Instance::All +# ========================================== +# Test stage +# ========================================== + gdk-instance-ff-inverse: - extends: gdk-instance + extends: .gdk-instance variables: QA_FEATURE_FLAGS: $FEATURE_FLAGS rules: - !reference [.rules:test:feature-flags-set, rules] gdk-instance-gitaly-transactions: - extends: gdk-instance + extends: .gdk-instance variables: QA_GITALY_TRANSACTIONS_ENABLED: "true" rules: @@ -111,7 +111,7 @@ gdk-instance-gitaly-transactions: # balancing. Adding 5s lag to 1 of the replicas to validate robustness of # the load balancer. gdk-instance-with-load-balancer: - extends: gdk-instance + extends: .gdk-instance variables: WITH_LOAD_BALANCER: "true" rules: diff --git a/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml b/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml index 4e4aab73880a10..84047457cb24aa 100644 --- a/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-omnibus/main.gitlab-ci.yml @@ -84,19 +84,6 @@ health-check: - if: $RUN_ALL_TESTS == "true" - if: $QA_SUITES =~ /Test::Instance::HealthCheck/ -# ========== instance =========== -instance: - extends: - - .parallel - - .omnibus-e2e - variables: - QA_SCENARIO: Test::Instance::Image - QA_RUN_IN_PARALLEL: true - rules: - # gitlab-org/gitlab pipelines run instance suite in both gdk and cng deployments - - when: manual - allow_failure: true - # ========== praefect =========== praefect: extends: @@ -112,24 +99,6 @@ praefect: - !reference [.rules:test:smoke-for-omnibus-mr, rules] - if: $QA_SUITES =~ /Test::Instance::Create/ -# ========== gitaly transactions enabled =========== -# https://docs.gitlab.com/ee/architecture/blueprints/gitaly_transaction_management/ -gitaly-transactions: - when: manual - extends: - - .parallel - - .omnibus-e2e - - .with-ignored-runtime-data - variables: - QA_SCENARIO: Test::Integration::Praefect - QA_SUITE_CLASS_NAME: Test::Instance::Create # overrides default 'All' suite to only run 'Create' group specs - QA_CAN_TEST_PRAEFECT: "true" - QA_GITALY_TRANSACTIONS_ENABLED: "true" - QA_RUN_IN_PARALLEL: true - rules: - - !reference [.rules:test:omnibus-base, rules] - - if: $QA_SUITES =~ /Test::Instance::Create/ - # ========== gitaly reftables backend =========== # Verifies that E2E tests that interact with the gitaly backend work when the reftables backend is in use # https://about.gitlab.com/blog/2024/05/30/a-beginners-guide-to-the-git-reftable-format/ @@ -245,29 +214,6 @@ mattermost: - !reference [.rules:test:omnibus-base, rules] - if: $QA_SUITES =~ /Test::Integration::Mattermost/ -registry: - extends: - - .omnibus-e2e - variables: - QA_SCENARIO: Test::Integration::Registry - rules: - - !reference [.rules:test:omnibus-base, rules] - - if: $QA_SUITES =~ /Test::Integration::Registry/ - -# ========== Relative url =========== -# Only run a subset of smoke suite -relative-url: - extends: - - .parallel - - .omnibus-e2e - - .with-ignored-runtime-data - variables: - QA_SCENARIO: Test::Instance::RelativeUrl - QA_RSPEC_TAGS: --tag smoke --tag ~orchestrated --tag ~skip_live_env - rules: - - !reference [.rules:test:omnibus-base, rules] - - if: $QA_SUITES =~ /Test::Instance::All/ - repository-storage: extends: - .omnibus-e2e diff --git a/qa/qa/scenario/test/instance/all.rb b/qa/qa/scenario/test/instance/all.rb index b9c2097b688f66..3c8d6dbd1e0447 100644 --- a/qa/qa/scenario/test/instance/all.rb +++ b/qa/qa/scenario/test/instance/all.rb @@ -13,8 +13,8 @@ class All < Template include SharedAttributes pipeline_mappings test_on_cng: %w[cng-instance], - test_on_gdk: %w[gdk-instance gdk-instance-gitaly-transactions gdk-instance-ff-inverse], - test_on_omnibus: %w[instance git-sha256-repositories relative-url] + test_on_gdk: %w[gdk-instance-gitaly-transactions gdk-instance-ff-inverse], + test_on_omnibus: %w[git-sha256-repositories] end end end diff --git a/qa/qa/scenario/test/instance/create.rb b/qa/qa/scenario/test/instance/create.rb index bc95092012f4a2..20829e98351a1a 100644 --- a/qa/qa/scenario/test/instance/create.rb +++ b/qa/qa/scenario/test/instance/create.rb @@ -7,7 +7,7 @@ module Instance class Create < All spec_glob_pattern "qa/specs/features/**/3_create/**/*_spec.rb" - pipeline_mappings test_on_omnibus: %w[praefect gitaly-transactions gitaly-reftables-backend] + pipeline_mappings test_on_omnibus: %w[praefect gitaly-reftables-backend] end end end diff --git a/qa/qa/scenario/test/integration/registry.rb b/qa/qa/scenario/test/integration/registry.rb index 3deb89b8048381..7a5cbb810f69c6 100644 --- a/qa/qa/scenario/test/integration/registry.rb +++ b/qa/qa/scenario/test/integration/registry.rb @@ -7,7 +7,7 @@ module Integration class Registry < Test::Instance::All tags :registry - pipeline_mappings test_on_cng: %w[cng-registry], test_on_omnibus: %w[registry] + pipeline_mappings test_on_cng: %w[cng-registry] end end end -- GitLab From 13d1cc232a488c144c8b2db03b21f54362dff3f4 Mon Sep 17 00:00:00 2001 From: treagitlab Date: Wed, 17 Dec 2025 15:45:43 -0800 Subject: [PATCH 2/2] Move process coverage from gdk to cng --- .gitlab/ci/rules.gitlab-ci.yml | 8 +++++++- .gitlab/ci/test-on-cng/main.gitlab-ci.yml | 6 ++++++ .gitlab/ci/test-on-gdk/main.gitlab-ci.yml | 6 ------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 09a25b9440e4d6..cb6c1b6fbe80b0 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -2093,6 +2093,7 @@ DEPENDENCY_UPDATE: "true" - <<: *if-merge-request changes: *code-qa-patterns + when: manual allow_failure: true variables: MR_CODE_PATTERNS: "true" @@ -2171,7 +2172,12 @@ - !reference [".prevent-tier-1", rules] - !reference [".qa:rules:e2e-blocking-base-after", rules] - <<: *if-dot-com-gitlab-org-schedule - variables: *qa-e2e-test-schedule-variables + variables: + <<: *qa-e2e-test-schedule-variables + COVERBAND_ENABLED: "true" + # https://gitlab.com/gitlab-org/gitlab/-/blob/master/babel.config.js + # This sets the environmental variable enabling `istanbul` plugin in Babel + BABEL_ENV: "istanbul" .qa:rules:e2e:perf-on-cng: rules: diff --git a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml index af58d384615af3..ed8dafe768ebe7 100644 --- a/.gitlab/ci/test-on-cng/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-cng/main.gitlab-ci.yml @@ -236,3 +236,9 @@ upload-test-runtime-data: extends: - .upload-test-runtime-data - .rules:report:upload-test-runtime-data + +process-e2e-coverage: + extends: + - .process-e2e-coverage + needs: + - job: cng-instance diff --git a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml index 9eb04eaf30fcae..bb632c3e684381 100644 --- a/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml +++ b/.gitlab/ci/test-on-gdk/main.gitlab-ci.yml @@ -151,12 +151,6 @@ export-frontend-code-paths-mapping: extends: - .export-frontend-code-paths-mapping -process-e2e-coverage: - extends: - - .process-e2e-coverage - needs: - - job: gdk-instance - notify-slack: extends: - .notify-slack -- GitLab