From 9d1d2d0420f9fc7d4ea63b0f2750b5347b259772 Mon Sep 17 00:00:00 2001
From: Claudia Beresford <claudiaberesford@gmail.com>
Date: Wed, 3 Nov 2021 16:06:07 +0000
Subject: [PATCH] Update nightly_e2e workflow

---
 .github/workflows/nightly_e2e.yml | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/nightly_e2e.yml b/.github/workflows/nightly_e2e.yml
index 3c90aad29..0fe3b0d5c 100644
--- a/.github/workflows/nightly_e2e.yml
+++ b/.github/workflows/nightly_e2e.yml
@@ -1,9 +1,10 @@
 name: nightly_e2e
 
+  # TODO: put this back
 on:
-  workflow_dispatch: {}
-  schedule:
-    - cron: 0 0 * * *
+  pull_request:
+    branches:
+      - nightly-e2e
 
 jobs:
   e2e:
@@ -11,18 +12,14 @@ jobs:
     name: e2e tests
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-go@v2
-      with:
-        go-version: '^1.17.2'
-    # TODO
-    # have a custom action for the setup so that we can get outputs for the cleanup projects
-    # rather than hardcoding
     - name: Run tests
-      run: make test-e2e
       env:
         METAL_AUTH_TOKEN: ${{ secrets.METAL_AUTH_TOKEN }}
-    - name: Cleanup projects
+      run: |
+        pip3 install -r hack/tools/requirements.txt
+        hack/tools/run.py run-e2e -o ${{ secrets.EQUINIX_ORG_ID }} -p flintlock_nightly_e2e
+    - name: Cleanup project
       uses: weaveworks/metal-janitor-action@b0373b3a6a8bb1e6573616040121c22ba230cdc8
       with:
         metal_auth_token: ${{ secrets.METAL_AUTH_TOKEN }}
-        project_names: 'quicksilver_e2e_1'
+        project_names: 'flintlock_nightly_e2e'