Merge branch 'andrey-fix-feature-flag-changes' into 'master'

Do not set QA_FEATURE_FLAGS variable for the whole pipeline

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139052



Merged-by: David Dieulivol <ddieulivol@gitlab.com>
Approved-by: David Dieulivol <ddieulivol@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

.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]
 

.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

.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"

scripts/generate-e2e-pipeline

@@ -40,8 +40,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: "none"
   GITLAB_QA_CACHE_KEY: "$qa_cache_key"
   GITLAB_SEMVER_VERSION: "$(cat VERSION)"
+  FEATURE_FLAGS: "${QA_FEATURE_FLAGS}"
   QA_EXPORT_TEST_METRICS: "${QA_EXPORT_TEST_METRICS:-true}"
-  QA_FEATURE_FLAGS: "${QA_FEATURE_FLAGS}"
   QA_FRAMEWORK_CHANGES: "${QA_FRAMEWORK_CHANGES:-false}"
   QA_RUN_ALL_TESTS: "${QA_RUN_ALL_TESTS:-false}"
   QA_RUN_ALL_E2E_LABEL: "${QA_RUN_ALL_E2E_LABEL:-false}"