From 08e9a1dec8fd20ebea56a841bcfab1630bb13e1c Mon Sep 17 00:00:00 2001
From: Tiago Nobrega <tiago.nobrega@canonical.com>
Date: Fri, 12 Jul 2024 14:20:16 -0300
Subject: [PATCH] chore(ci): move base devel spread tests to manual

These tests are by their very nature flaky because the base devel changes
constantly and can occasionally break in a way that cannot be fixed by us.
However, we still want to keep an eye on them so repurpose the 'large'
spread run into a 'manual' one that, via cron, runs both the 'large' tests
and the 'flaky' ones.
---
 .../{spread-large.yaml => spread-manual.yaml}          | 10 +++++-----
 spread.yaml                                            |  4 ++--
 .../base-devel/rockcraft.orig.yaml                     |  0
 .../spread/{rockcraft => manual}/base-devel/task.yaml  |  0
 .../{large => manual}/repo-overlay/rockcraft.yaml      |  0
 tests/spread/{large => manual}/repo-overlay/task.yaml  |  0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename .github/workflows/{spread-large.yaml => spread-manual.yaml} (80%)
 rename tests/spread/{rockcraft => manual}/base-devel/rockcraft.orig.yaml (100%)
 rename tests/spread/{rockcraft => manual}/base-devel/task.yaml (100%)
 rename tests/spread/{large => manual}/repo-overlay/rockcraft.yaml (100%)
 rename tests/spread/{large => manual}/repo-overlay/task.yaml (100%)

diff --git a/.github/workflows/spread-large.yaml b/.github/workflows/spread-manual.yaml
similarity index 80%
rename from .github/workflows/spread-large.yaml
rename to .github/workflows/spread-manual.yaml
index 0fc20cc09..8e8554135 100644
--- a/.github/workflows/spread-large.yaml
+++ b/.github/workflows/spread-manual.yaml
@@ -1,4 +1,4 @@
-name: Spread (large)
+name: Spread (manual - large/flaky)
 on:
   pull_request:
     types: [ labeled ]
@@ -7,7 +7,7 @@ on:
 
 jobs:
   snap-build:
-    if: ${{ github.event.label.name == 'run-large-spread' || github.event_name == 'schedule' }}
+    if: ${{ github.event.label.name == 'run-manual-spread' || github.event_name == 'schedule' }}
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
@@ -24,7 +24,7 @@ jobs:
           path: ${{ steps.rockcraft.outputs.snap }}
 
   snap-tests:
-    if: ${{ github.event.label.name == 'run-large-spread' || github.event_name == 'schedule' }}
+    if: ${{ github.event.label.name == 'run-manual-spread' || github.event_name == 'schedule' }}
     runs-on: [self-hosted, spread-installed]
     needs: [snap-build]
 
@@ -43,8 +43,8 @@ jobs:
         with:
           name: snap
           path: tests
-      - name: Run spread (large)
-        run: spread tests/spread/large/
+      - name: Run spread (large/flaky)
+        run: spread tests/spread/manual/
         
       - name: Discard spread workers
         if: always()
diff --git a/spread.yaml b/spread.yaml
index c04220268..e20919c5e 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -140,8 +140,8 @@ suites:
   tests/spread/foreign/:
     summary: tests that rockcraft and rocks work on different host systems
 
-  tests/spread/large/:
-    summary: bigger tests that take longer to run
+  tests/spread/manual/:
+    summary: manually-triggered tests, like bigger tests and flaky ones
     manual: true
     systems:
     - ubuntu-22.04-64
diff --git a/tests/spread/rockcraft/base-devel/rockcraft.orig.yaml b/tests/spread/manual/base-devel/rockcraft.orig.yaml
similarity index 100%
rename from tests/spread/rockcraft/base-devel/rockcraft.orig.yaml
rename to tests/spread/manual/base-devel/rockcraft.orig.yaml
diff --git a/tests/spread/rockcraft/base-devel/task.yaml b/tests/spread/manual/base-devel/task.yaml
similarity index 100%
rename from tests/spread/rockcraft/base-devel/task.yaml
rename to tests/spread/manual/base-devel/task.yaml
diff --git a/tests/spread/large/repo-overlay/rockcraft.yaml b/tests/spread/manual/repo-overlay/rockcraft.yaml
similarity index 100%
rename from tests/spread/large/repo-overlay/rockcraft.yaml
rename to tests/spread/manual/repo-overlay/rockcraft.yaml
diff --git a/tests/spread/large/repo-overlay/task.yaml b/tests/spread/manual/repo-overlay/task.yaml
similarity index 100%
rename from tests/spread/large/repo-overlay/task.yaml
rename to tests/spread/manual/repo-overlay/task.yaml