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 deleted file mode 100644 index a844223bc..000000000 --- a/tests/spread/smoketests/basic/charmcraft-alma9.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: alma9 -type: charm -title: A charm built and running on Almalinux 9. -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: diff --git a/tests/spread/smoketests/basic/task.yaml b/tests/spread/smoketests/basic/task.yaml index 5b9660aa3..07a9445bd 100644 --- a/tests/spread/smoketests/basic/task.yaml +++ b/tests/spread/smoketests/basic/task.yaml @@ -14,9 +14,8 @@ environment: CHARM_TYPE/jammy_platforms,noble_platforms,noble_platforms_all,noble_platforms_python: platforms EXTRA/jammy_bases_all,noble_platforms_all: "-all" EXTRA/noble_platforms_python: "-python" - # 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/