Add latest changes from gitlab-org/gitlab@master

3 files changed, 22 insertions, 4 deletions

diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index b61c7bc90c9..9ece789eb2a 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -149,6 +149,28 @@ follow-up-e2e:package-and-test-ee:
     QA_RUN_TYPE: e2e-package-and-test
     PIPELINE_NAME: E2E Omnibus GitLab EE
 
+e2e:post-run-e2e-message:
+  extends:
+    - .predictive-job
+    - .qa:rules:determine-e2e-tests
+  stage: qa
+  variables:
+    ENV_FILE: $CI_PROJECT_DIR/qa_tests_vars.env
+  image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}
+  before_script:
+    - source scripts/utils.sh
+    - install_gitlab_gem
+  script:
+    - scripts/generate-message-to-run-e2e-pipeline.rb
+  needs:
+    - e2e-test-pipeline-generate
+    - trigger-omnibus-env
+    - build-assets-image
+  artifacts:
+    expire_in: 1 day
+    paths:
+      - "${CI_PROJECT_DIR}/qa_tests_vars.env"
+
 e2e:package-and-test-ce:
   extends:
     - e2e:package-and-test-ee
diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml
index 8586723a26e..19eacd8c54c 100644
--- a/.gitlab/ci/rails/shared.gitlab-ci.yml
+++ b/.gitlab/ci/rails/shared.gitlab-ci.yml
@@ -101,7 +101,6 @@ include:
       - crystalball/
       - deprecations/
       - knapsack/
-      - query_recorder/
       - rspec/
       - tmp/capybara/
       - log/*.log
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index 196a1eb341f..b652ac5e30b 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -167,9 +167,6 @@ e2e-test-pipeline-generate:
   script:
     - bundle exec rake "ci:detect_changes[$ENV_FILE]"
     - cd $CI_PROJECT_DIR && scripts/generate-e2e-pipeline
-    - source scripts/utils.sh
-    - install_gitlab_gem
-    - scripts/generate-message-to-run-e2e-pipeline.rb
   artifacts:
     expire_in: 1 day
     paths: