Update pull_request.yaml after KU-1195 (#16)

canonical · Aug 9, 2024 · cb83523 · cb83523
1 parent ab72db4
commit cb83523
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -15,7 +15,7 @@ jobs:
       multiarch-awareness: true
       cache-action: ${{ (github.event_name == 'push') && 'save' || 'restore' }}
       # pinning to use rockcraft 1.3.0 feature `entrypoint-service`
-      rockcraft-revisions: '{"amd64": "1783", "arm64": "1784"}'
+      rockcraft-revisions: '{"amd64": "2218", "arm64": "2222"}'
       arch-skipping-maximize-build-space: '["arm64"]'
       platform-labels: '{"arm64": ["self-hosted", "Linux", "ARM64", "jammy"]}'
   run-tests:
@@ -36,6 +36,7 @@ jobs:
     name: Combine Rocks and Push Multiarch Manifest
     uses: canonical/k8s-workflows/.github/workflows/assemble_multiarch_image.yaml@main
     needs: [build-and-push-arch-specifics]
+    if: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas != '[]' }}
     with:
-      rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.rock-metas }}
+      rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas }}
       dry-run: ${{ github.event_name != 'push' }}
diff --git a/tests/sanity/test_rock.py b/tests/sanity/test_rock.py
@@ -15,5 +15,5 @@ def test_sanity(image_version):
 
     entrypoint = "/cluster-autoscaler"
     # assert we have the expected files
-    process = docker_util.run_in_docker(image, [entrypoint, "--help"])
+    process = docker_util.run_in_docker(image, [entrypoint, "--help"], check_exit_code=False)
     assert "Usage of /cluster-autoscaler:" in process.stderr