From 327856d0266f27d54a527b336a9a9279200316bf Mon Sep 17 00:00:00 2001
From: Jonathan Green <jonathan@razzard.com>
Date: Fri, 3 May 2024 10:28:40 -0300
Subject: [PATCH] Move out docker migration test

---
 .github/workflows/build.yml | 28 +++++++++++++++++++++++++++-
 .github/workflows/test.yml  | 22 ----------------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e49729ac3..6ee20f0fab 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -205,10 +205,36 @@ jobs:
         if: always()
         run: docker compose down
 
+  migration-test:
+    name: Migration test
+    runs-on: ubuntu-latest
+    needs: [build]
+    permissions:
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+
+      # See comment here: https://github.com/actions/runner-images/issues/1187#issuecomment-686735760
+      - name: Disable network offload
+        run: sudo ethtool -K eth0 tx off rx off
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Test migrations
+        run: ./docker/ci/test_migrations.sh
+        env:
+          BUILD_CACHE_FROM: type=gha,scope=buildkit-${{ github.run_id }}
+          BUILD_BASE_IMAGE: ${{ needs.build.outputs.baseimage }}
+
   push:
     name: Push circ-${{ matrix.image }}
     runs-on: ubuntu-latest
-    needs: [build, integration-test, unit-test]
+    needs: [build, integration-test, unit-test, migration-test]
     permissions:
       contents: read
       packages: write
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 58e3889b2b..b0b6a8c33c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,25 +54,3 @@ jobs:
           files: ./coverage.xml
           name: test-${{ matrix.python-version }}
           verbose: true
-
-  docker-test-migrations:
-    name: Docker migration test
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          persist-credentials: false
-          fetch-depth: 0
-
-      # See comment here: https://github.com/actions/runner-images/issues/1187#issuecomment-686735760
-      - name: Disable network offload
-        run: sudo ethtool -K eth0 tx off rx off
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Test migrations
-        run: ./docker/ci/test_migrations.sh