Fixed Skopeo/Docker issues for Reef releases

canonical · Nov 22, 2024 · 63b737b · 63b737b
1 parent 879be92
commit 63b737b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 43 deletions.
diff --git a/.github/workflows/build_and_test.yaml b/.github/workflows/build_and_test.yaml
@@ -25,13 +25,14 @@ jobs:
       - name: Setup LXD
         uses: canonical/setup-lxd@v0.1.1
         with:
-          channel: 5.21/edge
+          channel: 5.21/stable
       - name: Prepare Rock
-        run: ./scripts/test-helper.sh build_rock
+        uses: canonical/craft-actions/rockcraft-pack@main
+        id: rockcraft
       - uses: actions/upload-artifact@v3
         with:
           name: rock
-          path: ceph.rock
+          path: ${{ steps.rockcraft.outputs.rock }} 
 
   flake8-lint:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/publish_edge.yaml b/.github/workflows/publish_edge.yaml
@@ -58,10 +58,20 @@ jobs:
             type=raw,value=dev-edge,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       - name: Prepare Rock
-        run: ./scripts/test-helper.sh build_rock
+        uses: canonical/craft-actions/rockcraft-pack@main
+        id: rockcraft
 
       - name: Load to Docker daemon
-        run: ./scripts/test-helper.sh load_to_docker $TAGS
+        run: |
+            # iterate through the tags
+            for tag in $TAGS; do
+              echo "$tag"
+              docker image ls -a
+              docker import ${{ steps.rockcraft.outputs.rock }} $tag
+            done
+            docker image ls -a
+            sleep 10
+            docker push ghcr.io/canonical/ceph --all-tags
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
 
diff --git a/.github/workflows/publish_hotfix.yaml b/.github/workflows/publish_hotfix.yaml
@@ -67,12 +67,21 @@ jobs:
           images: ghcr.io/canonical/ceph
           tags: |
             type=raw,value=hotfix-${{ github.event.pull_request.number }}-${{ steps.versioning.outputs.ceph_version }}
-  
+        
       - name: Prepare Rock
-        run: ./scripts/test-helper.sh build_rock
+        uses: canonical/craft-actions/rockcraft-pack@main
+        id: rockcraft
 
       - name: Load to Docker daemon
-        run: ./scripts/test-helper.sh load_to_docker $TAGS
+        run: |
+            # iterate through the tags
+            for tag in $TAGS; do
+              echo "$tag"
+              docker image ls -a
+              docker import ${{ steps.rockcraft.outputs.rock }} $tag
+            done
+            docker image ls -a
+            sleep 10
+            docker push ghcr.io/canonical/ceph --all-tags
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
-
diff --git a/.github/workflows/publish_release.yaml b/.github/workflows/publish_release.yaml
@@ -59,9 +59,19 @@ jobs:
             type=raw,value=reef,enable=${{ startsWith(steps.versioning.outputs.ceph_version, '18') }}
 
       - name: Prepare Rock
-        run: ./scripts/test-helper.sh build_rock
+        uses: canonical/craft-actions/rockcraft-pack@main
+        id: rockcraft
 
       - name: Load to Docker daemon
-        run: ./scripts/test-helper.sh load_to_docker $TAGS
+        run: |
+            # iterate through the tags
+            for tag in $TAGS; do
+              echo "$tag"
+              docker image ls -a
+              docker import ${{ steps.rockcraft.outputs.rock }} $tag
+            done
+            docker image ls -a
+            sleep 10
+            docker push ghcr.io/canonical/ceph --all-tags
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
diff --git a/scripts/test-helper.sh b/scripts/test-helper.sh