diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-07 15:11:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-07 15:11:20 +0300 |
| commit | 8e81ce50767bd5c785072c2487ffb61fe075977c (patch) | |
| tree | 87fe3686b23f2581843a068d0278ee4018931c3f /.gitlab | |
| parent | 0125f11d6bf7af5817dce9d87a116e2ed6bd1917 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/package-and-test/main.gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/qa-common/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/qa-common/rules.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/qa-common/variables.gitlab-ci.yml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml index bbfb7924d1e..afd66a36b0a 100644 --- a/.gitlab/ci/package-and-test/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/main.gitlab-ci.yml @@ -64,6 +64,7 @@ instance-ff-inverse: variables: QA_SCENARIO: Test::Instance::Image QA_KNAPSACK_REPORT_NAME: instance + QA_FEATURE_FLAGS: $FEATURE_FLAGS rules: - !reference [.rules:test:feature-flags-set, rules] diff --git a/.gitlab/ci/qa-common/main.gitlab-ci.yml b/.gitlab/ci/qa-common/main.gitlab-ci.yml index dc00299cc61..d7fe64abc22 100644 --- a/.gitlab/ci/qa-common/main.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/main.gitlab-ci.yml @@ -5,7 +5,7 @@ workflow: name: $PIPELINE_NAME include: - - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@7.13.2" + - component: "gitlab.com/gitlab-org/quality/pipeline-common/allure-report@8.0.0" inputs: job_name: "e2e-test-report" job_stage: "report" diff --git a/.gitlab/ci/qa-common/rules.gitlab-ci.yml b/.gitlab/ci/qa-common/rules.gitlab-ci.yml index 0d4e6ef5c4f..31f84441926 100644 --- a/.gitlab/ci/qa-common/rules.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/rules.gitlab-ci.yml @@ -11,7 +11,7 @@ include: # FF changes .feature-flags-set: &feature-flags-set - if: $QA_FEATURE_FLAGS =~ /enabled|disabled/ + if: $FEATURE_FLAGS =~ /enabled|disabled/ # Specific specs specified .spec-file-specified: &spec-file-specified @@ -33,7 +33,7 @@ include: # Run all tests when QA framework changes present, full suite execution is explicitly enabled or a feature flag file is removed .qa-run-all-tests: &qa-run-all-tests - if: $QA_FRAMEWORK_CHANGES == "true" || $QA_RUN_ALL_TESTS == "true" || $QA_RUN_ALL_E2E_LABEL == "true" || $QA_FEATURE_FLAGS =~ /deleted/ + if: $QA_FRAMEWORK_CHANGES == "true" || $QA_RUN_ALL_TESTS == "true" || $QA_RUN_ALL_E2E_LABEL == "true" || $FEATURE_FLAGS =~ /deleted/ # Run job when MR has pipeline:run-all-e2e label .qa-run-all-e2e-label: &qa-run-all-e2e-label diff --git a/.gitlab/ci/qa-common/variables.gitlab-ci.yml b/.gitlab/ci/qa-common/variables.gitlab-ci.yml index a449d960cff..bc756b6808a 100644 --- a/.gitlab/ci/qa-common/variables.gitlab-ci.yml +++ b/.gitlab/ci/qa-common/variables.gitlab-ci.yml @@ -6,9 +6,9 @@ variables: REGISTRY_GROUP: "gitlab-org" ALLURE_JOB_NAME: $CI_PROJECT_NAME COLORIZED_LOGS: "true" + FEATURE_FLAGS: "" QA_LOG_LEVEL: "info" QA_TESTS: "" - QA_FEATURE_FLAGS: "" # run all tests by default when package-and-test is included natively in other projects # this will be overridden when selective test execution is used in gitlab canonical project QA_RUN_ALL_TESTS: "true" |