Skip to content

Commit

Permalink
Remnamed exported-bundle.yaml to exported_bundle.yaml.
Browse files Browse the repository at this point in the history
  • Loading branch information
anvial authored and barrettj12 committed Aug 12, 2022
1 parent ed2f41b commit 26a57a7
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions tests/suites/deploy/deploy_bundles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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"
}
Expand Down

0 comments on commit 26a57a7

Please sign in to comment.