From d2f625e39577386f5a9d761f3956df82a12e33f0 Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Fri, 16 Aug 2024 13:36:46 -0400 Subject: [PATCH 1/2] chore(ci): re-enable alma spread tests --- tests/spread/smoketests/basic-centos-7/task.yaml | 2 +- tests/spread/smoketests/basic/charmcraft-alma9.yaml | 2 +- tests/spread/smoketests/basic/task.yaml | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/spread/smoketests/basic-centos-7/task.yaml b/tests/spread/smoketests/basic-centos-7/task.yaml index fafa03748..0af6a5ce4 100644 --- a/tests/spread/smoketests/basic-centos-7/task.yaml +++ b/tests/spread/smoketests/basic-centos-7/task.yaml @@ -4,7 +4,7 @@ systems: # CentOS 7 only works in 18.04 because it needs cgroup v1 - ubuntu-18.04-64 kill-timeout: 30m -# Disabling auto-run until we can resolve linuxcontainers.org issue. +# Disabling auto-run until we can source a centos image. # https://github.com/canonical/charmcraft/issues/1496 manual: true diff --git a/tests/spread/smoketests/basic/charmcraft-alma9.yaml b/tests/spread/smoketests/basic/charmcraft-alma9.yaml index a844223bc..42b66ae18 100644 --- a/tests/spread/smoketests/basic/charmcraft-alma9.yaml +++ b/tests/spread/smoketests/basic/charmcraft-alma9.yaml @@ -1,6 +1,6 @@ name: alma9 type: charm -title: A charm built and running on Almalinux 9. +title: An Almalinux 9 charm. summary: A charm built and running on Almalinux 9. description: A charm built and running on Almalinux 9. bases: diff --git a/tests/spread/smoketests/basic/task.yaml b/tests/spread/smoketests/basic/task.yaml index c4ea172c9..43a9f1c2c 100644 --- a/tests/spread/smoketests/basic/task.yaml +++ b/tests/spread/smoketests/basic/task.yaml @@ -8,9 +8,8 @@ environment: BASE_CHANNEL/noble_platforms: 24.04 CHARM_TYPE/focal_bases,jammy_bases: bases CHARM_TYPE/jammy_platforms,noble_platforms: platforms - # Alma Linux is disabled temporarily: https://github.com/canonical/charmcraft/issues/1496 - # BASE_CHANNEL/alma: alma9 - # CHARM_TYPE/alma: bases + BASE_CHANNEL/alma: alma9 + CHARM_TYPE/alma: bases include: - tests/ From da6060365d5bbf15693886e028caa46abc49444b Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Fri, 16 Aug 2024 17:06:24 -0400 Subject: [PATCH 2/2] fix(tests): fix the alma bases test and delete an unnecessary yaml file --- tests/spread/smoketests/basic/charmcraft-alma9.yaml | 12 ------------ .../smoketests/basic/charmcraft-bases-alma9.yaml | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 tests/spread/smoketests/basic/charmcraft-alma9.yaml diff --git a/tests/spread/smoketests/basic/charmcraft-alma9.yaml b/tests/spread/smoketests/basic/charmcraft-alma9.yaml deleted file mode 100644 index 42b66ae18..000000000 --- a/tests/spread/smoketests/basic/charmcraft-alma9.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: alma9 -type: charm -title: An Almalinux 9 charm. -summary: A charm built and running on Almalinux 9. -description: A charm built and running on Almalinux 9. -bases: - - build-on: - - name: almalinux - channel: "9" - run-on: - - name: almalinux - channel: "9" diff --git a/tests/spread/smoketests/basic/charmcraft-bases-alma9.yaml b/tests/spread/smoketests/basic/charmcraft-bases-alma9.yaml index a844223bc..42b66ae18 100644 --- a/tests/spread/smoketests/basic/charmcraft-bases-alma9.yaml +++ b/tests/spread/smoketests/basic/charmcraft-bases-alma9.yaml @@ -1,6 +1,6 @@ name: alma9 type: charm -title: A charm built and running on Almalinux 9. +title: An Almalinux 9 charm. summary: A charm built and running on Almalinux 9. description: A charm built and running on Almalinux 9. bases: