From 18df1bff1f67503d52fda80496e912a7697dea7b Mon Sep 17 00:00:00 2001 From: Alex Lowe Date: Mon, 22 Jul 2024 14:03:00 -0400 Subject: [PATCH] fix(tests): remove Mantic base Ubuntu Mantic is now EOL, causing launches to fail. Unfortunately, we cannot replace this with oracular due to https://github.com/canonical/craft-providers/issues/598 --- tests/spread/smoketests/basic/charmcraft-23.10.yaml | 12 ------------ .../smoketests/basic/charmcraft-bases-23.10.yaml | 12 ------------ tests/spread/smoketests/basic/task.yaml | 3 +-- tests/spread/smoketests/remote-build/task.yaml | 1 - 4 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 tests/spread/smoketests/basic/charmcraft-23.10.yaml delete mode 100644 tests/spread/smoketests/basic/charmcraft-bases-23.10.yaml diff --git a/tests/spread/smoketests/basic/charmcraft-23.10.yaml b/tests/spread/smoketests/basic/charmcraft-23.10.yaml deleted file mode 100644 index 984eb861c..000000000 --- a/tests/spread/smoketests/basic/charmcraft-23.10.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: mantic -type: charm -title: A charm built and running on mantic. -summary: A charm built and running on mantic. -description: A charm built and running on mantic. -bases: - - build-on: - - name: ubuntu - channel: "23.10" - run-on: - - name: ubuntu - channel: "23.10" diff --git a/tests/spread/smoketests/basic/charmcraft-bases-23.10.yaml b/tests/spread/smoketests/basic/charmcraft-bases-23.10.yaml deleted file mode 100644 index 984eb861c..000000000 --- a/tests/spread/smoketests/basic/charmcraft-bases-23.10.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: mantic -type: charm -title: A charm built and running on mantic. -summary: A charm built and running on mantic. -description: A charm built and running on mantic. -bases: - - build-on: - - name: ubuntu - channel: "23.10" - run-on: - - name: ubuntu - channel: "23.10" diff --git a/tests/spread/smoketests/basic/task.yaml b/tests/spread/smoketests/basic/task.yaml index 79ba8ac8b..8bf7a3b5f 100644 --- a/tests/spread/smoketests/basic/task.yaml +++ b/tests/spread/smoketests/basic/task.yaml @@ -5,9 +5,8 @@ priority: 50 # Because these can take a while, run them early. environment: BASE_CHANNEL/focal_bases: 20.04 BASE_CHANNEL/jammy_bases,jammy_platforms: 22.04 - BASE_CHANNEL/mantic_bases: 23.10 # Non-LTS BASE_CHANNEL/noble_platforms: 24.04 - CHARM_TYPE/focal_bases,jammy_bases,mantic_bases: bases + 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 diff --git a/tests/spread/smoketests/remote-build/task.yaml b/tests/spread/smoketests/remote-build/task.yaml index 9bcf821cc..4cb44247c 100644 --- a/tests/spread/smoketests/remote-build/task.yaml +++ b/tests/spread/smoketests/remote-build/task.yaml @@ -9,7 +9,6 @@ environment: LAUNCHPAD_TOKEN: "$(HOST: echo ${LAUNCHPAD_TOKEN})" BASE_NAME: ubuntu BASE_CHANNEL/jammy: 22.04 - BASE_CHANNEL/mantic: 23.10 # Non-LTS include: - tests/