From 1afe1939dd1908117993825d659032927ffff499 Mon Sep 17 00:00:00 2001
From: Alex Lowe <alex.lowe@canonical.com>
Date: Thu, 4 Apr 2024 12:40:33 -0400
Subject: [PATCH] ci: move remote-build tests to weekly job

---
 .github/workflows/spread-large.yaml |  7 +++++++
 .github/workflows/spread.yaml       | 32 -----------------------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/spread-large.yaml b/.github/workflows/spread-large.yaml
index 4d6013603..b0f7760a2 100644
--- a/.github/workflows/spread-large.yaml
+++ b/.github/workflows/spread-large.yaml
@@ -42,6 +42,7 @@ jobs:
           - charms/bundle
           - charms/reactive
           - smoketests/parallel-build
+          - smoketests/remote-build
 
     steps:
       - name: Cleanup job workspace
@@ -58,9 +59,15 @@ jobs:
         with:
           name: snap
       - name: Spread k8s operator
+        env:
+          LAUNCHPAD_TOKEN: ${{ secrets.LAUNCHPAD_TOKEN }}
         run: |
           spread google:tests/spread/${{ matrix.task }}
       - name: Clean up jobs
         if: ${{ always() }}
         run: |
           spread -discard
+          shopt -s nullglob
+          for r in .spread-reuse.*.yaml; do
+            spread -discard -reuse-pid="$(echo "$r" | grep -o -E '[0-9]+')"
+          done
diff --git a/.github/workflows/spread.yaml b/.github/workflows/spread.yaml
index c29b6788d..1aece5710 100644
--- a/.github/workflows/spread.yaml
+++ b/.github/workflows/spread.yaml
@@ -88,35 +88,3 @@ jobs:
           BUNDLE_DEFAULT_NAME: gh-ci-charmcraft-bundle
         run: |
           spread google:ubuntu-22.04-64:tests/spread/store/
-  snap-remote-build-tests:
-    runs-on: spread-installed
-    needs: [snap-build]
-
-    steps:
-      - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login == 'canonical') || (github.event_name == 'push' && github.ref == 'refs/heads/main')
-        name: Checkout charmcraft
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-          submodules: true
-
-      - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login == 'canonical') || (github.event_name == 'push' && github.ref == 'refs/heads/main')
-        name: Download snap artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: snap
-
-      - if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.owner.login == 'canonical') || (github.event_name == 'push' && github.ref == 'refs/heads/main')
-        name: Run spread
-        env:
-          LAUNCHPAD_TOKEN: ${{ secrets.LAUNCHPAD_TOKEN }}
-        run: |
-          spread google:ubuntu-22.04-64:tests/spread/smoketests/remote-build
-
-      - name: Discard spread workers
-        if: always()
-        run: |
-          shopt -s nullglob
-          for r in .spread-reuse.*.yaml; do
-            spread -discard -reuse-pid="$(echo "$r" | grep -o -E '[0-9]+')"
-          done