Merge branch 'andrey-remove-extra-vars' into 'master'

Remove variables from e2e-generate script

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



Merged-by: Lin Jen-Shin <jen-shin@gitlab.com>
Approved-by: Lin Jen-Shin <jen-shin@gitlab.com>
Co-authored-by: Andrejs Cunskis <acunskis@gitlab.com>

.gitlab/ci/qa-common/variables.gitlab-ci.yml

@@ -16,4 +16,5 @@ variables:
   QA_OMNIBUS_MR_TESTS: "only-smoke"
   # Retry failed specs in separate process
   QA_RETRY_FAILED_SPECS: "true"
-  GITLAB_HELM_CHART_REF: "b085a68939fa12d40f9ff933c5af35fec209b1cd" # helm chart ref used by test-on-cng pipeline
+  # helm chart ref used by test-on-cng pipeline
+  GITLAB_HELM_CHART_REF: "b085a68939fa12d40f9ff933c5af35fec209b1cd"

.gitlab/ci/qa.gitlab-ci.yml

@@ -41,6 +41,7 @@
     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
+    QA_EXPORT_TEST_METRICS: "true" # Export test metrics directly to influxdb by default
   inherit:
     variables:
       - CHROME_VERSION

scripts/generate-e2e-pipeline

@@ -41,11 +41,9 @@ variables:
   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_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}"
-  QA_SAVE_TEST_METRICS: "${QA_SAVE_TEST_METRICS:-false}"
   QA_SUITES: "$QA_SUITES"
   QA_TESTS: "$QA_TESTS"
   KNAPSACK_TEST_FILE_PATTERN: "$KNAPSACK_TEST_FILE_PATTERN"