Skip to content
Snippets Groups Projects
Verified Commit f1f83c6a authored by Andrejs Cunskis's avatar Andrejs Cunskis :palm_tree: Committed by GitLab
Browse files

Merge branch 'andrey-enable-test-on-cng' into 'master'

Enable test-on-cng in merge request pipelines

See merge request !168824



Merged-by: default avatarAndrejs Cunskis <acunskis@gitlab.com>
Approved-by: default avatarKev Kloss <kkloss@gitlab.com>
Approved-by: default avatarDavid Dieulivol <ddieulivol@gitlab.com>
parents 64cfa1a2 4b41b49c
No related branches found
No related tags found
2 merge requests!170053Security patch upgrade alert: Only expose to admins 17-4,!168824Enable test-on-cng in merge request pipelines
Pipeline #1494670083 passed
......@@ -262,6 +262,7 @@ e2e:test-on-cng:
PIPELINE_NAME: E2E CNG
DYNAMIC_PIPELINE_YML: test-on-cng-pipeline.yml
SKIP_MESSAGE: Skipping test-on-cng due to mr containing only quarantine changes!
allow_failure: true # TODO: remove once gitlab-org/quality/quality-engineering/team-tasks#3049 is finished
e2e:code-suggestions-eval:
extends:
......
......@@ -1735,6 +1735,7 @@
PROCESS_TEST_RESULTS: "true"
KNAPSACK_GENERATE_REPORT: "true"
QA_SAVE_TEST_METRICS: "true"
QA_RUN_IN_PARALLEL: "false" # disable single job parallelization due to incompatibility with knapsack and coverband
.qa:rules:e2e-schedule-blocking:
rules:
......@@ -1833,29 +1834,20 @@
.qa:rules:e2e:test-on-cng:
rules:
# Until https://gitlab.com/gitlab-org/quality/quality-engineering/CNG-mirror is stable enough,
# test-on-cng should not be part of development flow.
# Once it's ready, delete the two following rules, and uncomment the commented lines below.
- !reference [".qa:rules:e2e-test-never-run", rules]
- <<: *if-dot-com-gitlab-org-schedule
variables:
KNAPSACK_GENERATE_REPORT: "true"
PROCESS_TEST_RESULTS: "true"
QA_SAVE_TEST_METRICS: "true"
QA_RUN_IN_PARALLEL: "false" # disable single job parallelization due to incompatibility with knapsack and coverband
allow_failure: true
# - <<: *if-merge-request-targeting-stable-branch
# when: never
# - <<: *if-security-merge-request
# when: never
# - <<: *if-security-schedule
# when: never
# - !reference [".qa:rules:e2e-blocking-base-before", rules]
# - !reference [".prevent-tier-2-and-below", rules]
# - !reference [".qa:rules:e2e-blocking-base-after", rules]
# - !reference [".qa:rules:e2e-schedule-blocking", rules]
# - <<: *if-merge-request
# changes: *cng-orchestrator-patterns
- <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule
when: never
# TODO: Enable for stable branches once cng is fully enabled in mr pipelines
- <<: *if-merge-request-targeting-stable-branch
when: never
# TODO: Check security fork is able to build cng images before enabling
- <<: *if-security-merge-request
when: never
- <<: *if-security-schedule
when: never
- !reference [".qa:rules:e2e-blocking-base-before", rules]
- !reference [".prevent-tier-2-and-below", rules]
- !reference [".qa:rules:e2e-blocking-base-after", rules]
- !reference [".qa:rules:e2e-schedule-blocking", rules]
.qa:rules:test-on-omnibus-nightly:
rules:
......
......@@ -126,7 +126,6 @@ cng-instance:
variables:
DEPLOYMENT_TYPE: kind
EXTRA_DEPLOY_VALUES: --env COVERBAND_ENABLED=${COVERBAND_ENABLED}
allow_failure: true
# Test run against environment with minimum supported redis version defined in lib/system_check/app/redis_version_check.rb
cng-qa-min-redis-version:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment