From 26a57a77dd56967244f74030d61d77ed46b84cf3 Mon Sep 17 00:00:00 2001 From: Vitaly Antonenko Date: Thu, 11 Aug 2022 11:03:32 +0300 Subject: [PATCH] Remnamed exported-bundle.yaml to exported_bundle.yaml. --- tests/suites/deploy/deploy_bundles.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/suites/deploy/deploy_bundles.sh b/tests/suites/deploy/deploy_bundles.sh index b525f149170..c0f54c86515 100644 --- a/tests/suites/deploy/deploy_bundles.sh +++ b/tests/suites/deploy/deploy_bundles.sh @@ -77,13 +77,14 @@ run_deploy_exported_charmhub_bundle_with_fixed_revisions() { .machines.\"1\".constraints = \"arch=${MODEL_ARCH}\" " "${TEST_DIR}/telegraf_bundle.yaml" else - yq -i . "${TEST_DIR}/telegraf_bundle-bundle.yaml" + yq -i . "${TEST_DIR}/telegraf_bundle.yaml" fi # no need to wait for the bundle to finish deploying to # check the export. - juju export-bundle --filename "${TEST_DIR}/exported-bundle.yaml" - yq -i . "${TEST_DIR}/exported-bundle.yaml" - diff -u "${TEST_DIR}/telegraf_bundle.yaml" "${TEST_DIR}/exported-bundle.yaml" + echo "Compare export-bundle with telegraf_bundle" + juju export-bundle --filename "${TEST_DIR}/exported_bundle.yaml" + yq -i . "${TEST_DIR}/exported_bundle.yaml" + diff -u "${TEST_DIR}/telegraf_bundle.yaml" "${TEST_DIR}/exported_bundle.yaml" destroy_model "test-export-bundles-deploy-with-fixed-revisions" } @@ -123,10 +124,10 @@ run_deploy_exported_charmhub_bundle_with_float_revisions() { # The model should be updated immediately, so we can export the bundle before # everything is done deploying echo "Compare export-bundle with telegraf_bundle_with_revisions" - juju export-bundle --filename "${TEST_DIR}/exported-bundle.yaml" + juju export-bundle --filename "${TEST_DIR}/exported_bundle.yaml" # reformat the yaml to have the same format as telegraf_bundle_with_revisions.yaml - yq -i . "${TEST_DIR}/exported-bundle.yaml" - diff -u "${TEST_DIR}/telegraf_bundle_with_revisions.yaml" "${TEST_DIR}/exported-bundle.yaml" + yq -i . "${TEST_DIR}/exported_bundle.yaml" + diff -u "${TEST_DIR}/telegraf_bundle_with_revisions.yaml" "${TEST_DIR}/exported_bundle.yaml" destroy_model "test-export-bundles-deploy-with-float-revisions" }