From 183f0332be20325c9e6ddaff2553d4da48f0751e Mon Sep 17 00:00:00 2001 From: Berkay Tekin Oz Date: Fri, 19 Jul 2024 09:04:08 +0000 Subject: [PATCH 1/3] Fix version, introduce arm --- rockcraft.yaml => 1.28.2/rockcraft.yaml | 4 ++-- tests/integration/test_contour.py | 2 +- tests/sanity/test_rock.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename rockcraft.yaml => 1.28.2/rockcraft.yaml (97%) diff --git a/rockcraft.yaml b/1.28.2/rockcraft.yaml similarity index 97% rename from rockcraft.yaml rename to 1.28.2/rockcraft.yaml index 12a1603..4271804 100644 --- a/rockcraft.yaml +++ b/1.28.2/rockcraft.yaml @@ -3,7 +3,7 @@ base: bare build-base: ubuntu@22.04 license: Apache-2.0 -version: '1.28.5' +version: '1.28.2' summary: Contour is an open source Kubernetes ingress controller. description: | Contour is an open source Kubernetes ingress controller that works by deploying @@ -13,7 +13,7 @@ description: | and use of them does not imply any affiliation or endorsement. platforms: amd64: -# arm64: + arm64: services: diff --git a/tests/integration/test_contour.py b/tests/integration/test_contour.py index 0f5e71d..895885d 100644 --- a/tests/integration/test_contour.py +++ b/tests/integration/test_contour.py @@ -24,7 +24,7 @@ def test_integration_contour(module_instance: harness.Instance): - image_name_env_variable = "ROCK_CONTOUR" + image_name_env_variable = "ROCK_CONTOUR_V1_28_2" image_uri = os.getenv(image_name_env_variable) assert image_uri is not None, f"{image_name_env_variable} is not set" diff --git a/tests/sanity/test_rock.py b/tests/sanity/test_rock.py index fd3ba17..ace697a 100644 --- a/tests/sanity/test_rock.py +++ b/tests/sanity/test_rock.py @@ -7,7 +7,7 @@ def test_sanity(): - image_variable = "ROCK_CONTOUR" + image_variable = "ROCK_CONTOUR_V1_28_2" entrypoint = "contour" image = os.getenv(image_variable) assert image is not None, f"${image_variable} is not set" From a95a1a39e15b497b07e9d5c51ede67ea3c0a5d90 Mon Sep 17 00:00:00 2001 From: Berkay Tekin Oz Date: Fri, 19 Jul 2024 12:12:38 +0000 Subject: [PATCH 2/3] Remove large label for arm runners --- .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 c068059..b33dd52 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -17,7 +17,7 @@ jobs: # pinning to use rockcraft 1.3.0 feature `entrypoint-service` rockcraft-revisions: '{"amd64": "1783", "arm64": "1784"}' arch-skipping-maximize-build-space: '["arm64"]' - platform-labels: '{"arm64": ["self-hosted", "Linux", "ARM64", "jammy", "large"]}' + platform-labels: '{"arm64": ["self-hosted", "Linux", "ARM64", "jammy"]}' run-tests: uses: canonical/k8s-workflows/.github/workflows/run_tests.yaml@main needs: [build-and-push-arch-specifics] From 5e5cf623c7c451a26f11193cc6658912ee91701e Mon Sep 17 00:00:00 2001 From: Berkay Tekin Oz Date: Fri, 19 Jul 2024 13:32:28 +0000 Subject: [PATCH 3/3] Revert env rock naming --- tests/integration/test_contour.py | 2 +- tests/sanity/test_rock.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/test_contour.py b/tests/integration/test_contour.py index 895885d..0f5e71d 100644 --- a/tests/integration/test_contour.py +++ b/tests/integration/test_contour.py @@ -24,7 +24,7 @@ def test_integration_contour(module_instance: harness.Instance): - image_name_env_variable = "ROCK_CONTOUR_V1_28_2" + image_name_env_variable = "ROCK_CONTOUR" image_uri = os.getenv(image_name_env_variable) assert image_uri is not None, f"{image_name_env_variable} is not set" diff --git a/tests/sanity/test_rock.py b/tests/sanity/test_rock.py index ace697a..fd3ba17 100644 --- a/tests/sanity/test_rock.py +++ b/tests/sanity/test_rock.py @@ -7,7 +7,7 @@ def test_sanity(): - image_variable = "ROCK_CONTOUR_V1_28_2" + image_variable = "ROCK_CONTOUR" entrypoint = "contour" image = os.getenv(image_variable) assert image is not None, f"${image_variable} is not set"