From 7bd10766ec77c6683b0860399b6cf49fa2549789 Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Wed, 22 Apr 2026 20:28:36 +0100 Subject: [PATCH] Don't default to charmcraft 1.5/stable If no charmcraft version info is found we were defaulting to 1.5/stable but this is annoying if you want to test a newer version of charmcraft. So now we do nothing if no version is found i.e. use whatever is installed. --- openstack/tools/charmed_openstack_functest_runner.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openstack/tools/charmed_openstack_functest_runner.sh b/openstack/tools/charmed_openstack_functest_runner.sh index 84ed5c1..3690f0c 100755 --- a/openstack/tools/charmed_openstack_functest_runner.sh +++ b/openstack/tools/charmed_openstack_functest_runner.sh @@ -244,7 +244,13 @@ LOGFILE=$(mktemp --suffix=-charm-func-test-results) if ! $SKIP_BUILD; then # default value is 1.5/stable, assumed that later charm likely have charmcraft_channel value CHARMCRAFT_CHANNEL=$(grep charmcraft_channel osci.yaml | sed -r 's/.+:\s+(\S+)/\1/') - sudo snap refresh charmcraft --channel ${CHARMCRAFT_CHANNEL:-"1.5/stable"} + if [[ -n $CHARMCRAFT_CHANNEL ]]; then + sudo snap refresh charmcraft --channel $CHARMCRAFT_CHANNEL + else + echo "No charmcraft version info found (osci.yaml) - skipping charmcraft refresh" + fi + + echo "Using charmcraft version $(snap info charmcraft| sed -rn 's/^installed:\s+(\S+)\s+.+/\1/p')" # ensure lxc initialised lxd init --auto || true