e2e: generate async QA tests (#15191)

* run qa pipeline on main and release branches
sourcegraph · Oct 30, 2020 · 6c8a42b · 6c8a42b
1 parent 5219390
commit 6c8a42b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.buildkite/pipeline.qa.yml b/.buildkite/pipeline.qa.yml
@@ -2,9 +2,8 @@ env:
   VAGRANT_RUN_ENV: "CI"
 steps:
 - artifact_paths: ./*.png;./*.mp4;./ffmpeg.log
-  # setting to pass until tests are 100% confirmed as working, so as to avoid disrupting dev workflow on main
   command:
-    - .buildkite/vagrant-run.sh sourcegraph-qa-test || true
+    - .buildkite/vagrant-run.sh sourcegraph-qa-test
   label: ':docker::arrow_right::chromium:'
   agents:
     queue: 'baremetal'
diff --git a/enterprise/dev/ci/ci/pipeline-steps.go b/enterprise/dev/ci/ci/pipeline-steps.go
@@ -244,9 +244,9 @@ func wait(pipeline *bk.Pipeline) {
 	pipeline.AddWait()
 }
 
-func triggerE2E(c Config, commonEnv map[string]string) func(*bk.Pipeline) {
-	// Run e2e tests on release, patch and main branches
-	runE2E := c.releaseBranch || c.taggedRelease || c.isBextReleaseBranch || c.patch || c.branch == "main"
+func triggerE2EandQA(c Config, commonEnv map[string]string) func(*bk.Pipeline) {
+	// Run e2e and QA tests on release, patch and main branches
+	runE2EandQA := c.releaseBranch || c.taggedRelease || c.isBextReleaseBranch || c.patch || c.branch == "main"
 
 	var async bool
 	if c.branch == "main" {
@@ -266,7 +266,7 @@ func triggerE2E(c Config, commonEnv map[string]string) func(*bk.Pipeline) {
 	env["CI_DEBUG_PROFILE"] = commonEnv["CI_DEBUG_PROFILE"]
 
 	return func(pipeline *bk.Pipeline) {
-		if !runE2E {
+		if !runE2EandQA {
 			return
 		}
 
@@ -280,6 +280,16 @@ func triggerE2E(c Config, commonEnv map[string]string) func(*bk.Pipeline) {
 				Env:     env,
 			}),
 		)
+		pipeline.AddTrigger(":chromium:",
+			bk.Trigger("qa"),
+			bk.Async(async),
+			bk.Build(bk.BuildOptions{
+				Message: os.Getenv("BUILDKITE_MESSAGE"),
+				Commit:  c.commit,
+				Branch:  c.branch,
+				Env:     env,
+			}),
+		)
 	}
 }
 

diff --git a/enterprise/dev/ci/ci/pipeline.go b/enterprise/dev/ci/ci/pipeline.go
@@ -129,7 +129,7 @@ func GeneratePipeline(c Config) (*bk.Pipeline, error) {
 		//
 		// PERF: Try to order steps such that slower steps are first.
 		pipelineOperations = []func(*bk.Pipeline){
-			triggerE2E(c, env),
+			triggerE2EandQA(c, env),
 			addBackendIntegrationTests(c), // ~11m
 			addDockerImages(c, false),     // ~8m
 			addLint,                       // ~4.5m

diff --git a/test/qa/test.sh b/test/qa/test.sh
@@ -28,6 +28,7 @@ popd || exit
 source /root/.profile
 pushd client/web || exit
 yarn run test:regression:core
+yarn run test:regression:integrations
 popd || exit
 PID=$(pgrep ffmpeg)
 kill "$PID"