From ef047e0e02367ef221c48a9c5cc65d7ee2295849 Mon Sep 17 00:00:00 2001
From: Juan Andrade <juan@khanacademy.org>
Date: Mon, 9 Dec 2024 10:42:50 -0500
Subject: [PATCH 1/2] Fix some job issues

---
 jobs/e2e-test-cycloud.groovy | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/jobs/e2e-test-cycloud.groovy b/jobs/e2e-test-cycloud.groovy
index 9c4ea45..d6076c2 100644
--- a/jobs/e2e-test-cycloud.groovy
+++ b/jobs/e2e-test-cycloud.groovy
@@ -152,12 +152,12 @@ def runAllTestClients() {
    for (i = 0; i < NUM_WORKER_MACHINES; i++) {
       def workerId = i;  // avoid scoping problems
       jobs["e2e-test-${workerId}"] = {
-         swallowExceptions({
-            onWorker(WORKER_TYPE, '2h') {
-                _setupWebapp();
-                runE2ETests(workerId);
-            }
-         }, onException);
+
+         onWorker(WORKER_TYPE, '2h') {
+               _setupWebapp();
+               runE2ETests(workerId);
+         }
+
       };
    }
    parallel(jobs);

From efc48fb3314f102537af7e8f8804907b258ab078 Mon Sep 17 00:00:00 2001
From: Juan Andrade <juan@khanacademy.org>
Date: Mon, 9 Dec 2024 15:21:01 -0500
Subject: [PATCH 2/2] Generate secrets

---
 jobs/e2e-test-cycloud.groovy | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/jobs/e2e-test-cycloud.groovy b/jobs/e2e-test-cycloud.groovy
index d6076c2..3b79abd 100644
--- a/jobs/e2e-test-cycloud.groovy
+++ b/jobs/e2e-test-cycloud.groovy
@@ -172,10 +172,20 @@ def runE2ETests(workerId) {
 
    // NOTE: We hard-code the values here as it is an experiment that will be
    // removed soon.
-   def runE2ETestsArgs = ["env", "CYPRESS_PROJECT_ID=2c1iwj", "CYPRESS_RECORD_KEY=4c530cf3-79e5-44b5-aedb-f6f017f38cb5", "./dev/cypress/e2e/tools/start-cypress-cloud-run.ts"];
+   def runE2ETestsArgs = [
+      "./dev/cypress/e2e/tools/start-cypress-cloud-run.ts",
+      "--cyConfig baseUrl=\"${E2E_URL}\""
+   ];
 
    dir('webapp/services/static') {
-      exec(runE2ETestsArgs);
+      // We build the secrets first, so that we can create test users in our
+      // tests.
+      sh("yarn cypress:secrets");
+
+      withEnv(["CYPRESS_PROJECT_ID=2c1iwj",
+               "CYPRESS_RECORD_KEY=4c530cf3-79e5-44b5-aedb-f6f017f38cb5"]) {
+         exec(runE2ETestsArgs);
+      }
    }
 }