From 53b7d843e1b15fe780bdbfa08b4ce644411990ef Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Thu, 12 Sep 2024 09:38:50 +0100 Subject: [PATCH] Fix charm func test runner charmcraft default --- openstack/tools/charmed_openstack_functest_runner.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openstack/tools/charmed_openstack_functest_runner.sh b/openstack/tools/charmed_openstack_functest_runner.sh index a8f07bdf..335ac280 100755 --- a/openstack/tools/charmed_openstack_functest_runner.sh +++ b/openstack/tools/charmed_openstack_functest_runner.sh @@ -129,9 +129,8 @@ export TEST_CONSTRAINTS_FILE=https://raw.githubusercontent.com/openstack-charmer # 2. Build 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/') || CHARMCRAFT_CHANNEL="1.5/stable" - - sudo snap refresh charmcraft --channel "$CHARMCRAFT_CHANNEL" + CHARMCRAFT_CHANNEL=$(grep charmcraft_channel osci.yaml | sed -r 's/.+:\s+(\S+)/\1/') + sudo snap refresh charmcraft --channel ${CHARMCRAFT_CHANNEL:-"1.5/stable"} # ensure lxc initialised lxd init --auto || true