From 1326d90ead65201a27cb5f237d7cc1bf7a3e9ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciek=20Go=C5=82aszewski?= Date: Wed, 7 Aug 2024 20:21:29 +0200 Subject: [PATCH 1/3] Update pull_request.yaml after KU-1195 --- .github/workflows/pull_request.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index b33dd52..beba08a 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -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' }} From 32f69abe861faf2c99e23efeff172b40f8917e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciek=20Go=C5=82aszewski?= Date: Thu, 8 Aug 2024 22:08:16 +0200 Subject: [PATCH 2/3] Update pull_request.yaml --- .github/workflows/pull_request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index beba08a..8a8d0a2 100644 --- 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: From ac1ec693942d3f7bda42566f6ffb768b45a70a14 Mon Sep 17 00:00:00 2001 From: Maciej Golaszewski Date: Fri, 9 Aug 2024 10:07:17 +0200 Subject: [PATCH 3/3] tests fix --- tests/sanity/test_rock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sanity/test_rock.py b/tests/sanity/test_rock.py index f8687c0..7727391 100644 --- 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