summaryrefslogtreecommitdiff
path: root/.gitlab/ci/qa.gitlab-ci.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-02-17 12:11:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-02-17 12:11:17 +0000
commit4f8983ade80c0d71d4c8e6cc0d686c9cecf5e7d4 (patch)
tree3c51e09d9315acb8930c3c5383fb6384a3a841aa /.gitlab/ci/qa.gitlab-ci.yml
parente191aabc8fd068233ac7b21e6f1299e2c371faba (diff)
downloadgitlab-ce-4f8983ade80c0d71d4c8e6cc0d686c9cecf5e7d4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab/ci/qa.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/qa.gitlab-ci.yml17
1 files changed, 17 insertions, 0 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index 0ca20e95c47..a72e6fc0137 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -97,3 +97,20 @@ e2e:package-and-test:
include:
- artifact: package-and-test-pipeline.yml
job: e2e-test-pipeline-generate
+
+e2e:test-on-gdk:
+ extends:
+ - .qa:rules:e2e:test-on-gdk
+ stage: qa
+ needs:
+ # In scheduled master pipelines we wait for the image to be built.
+ # In MRs we assume the last scheduled master pipeline built the image already.
+ - job: build-qa-on-gdk-master-image
+ optional: true
+ allow_failure: true
+ trigger:
+ strategy: depend
+ forward:
+ yaml_variables: true
+ pipeline_variables: true
+ include: .gitlab/ci/test-on-gdk/main.gitlab-ci.yml