Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JUJU-1594] Fixed test-export-bundles-deploy-with-fixed-revisions whitespaces issue #14453

Merged
merged 3 commits into from
Aug 11, 2022
Merged

[JUJU-1594] Fixed test-export-bundles-deploy-with-fixed-revisions whitespaces issue #14453

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
697ad33
Fixed whitespace issue in case MODEL_ARCH is undefined.
anvial Aug 11, 2022
804a974
Fixed statis-analysis..
anvial Aug 11, 2022
f442c92
Remnamed exported-bundle.yaml to exported_bundle.yaml.
anvial Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions tests/suites/deploy/deploy_bundles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,15 @@ run_deploy_exported_charmstore_bundle_with_fixed_revisions() {
.machines.\"0\".constraints = \"arch=${MODEL_ARCH}\" |
.machines.\"1\".constraints = \"arch=${MODEL_ARCH}\"
" "${TEST_DIR}/telegraf_bundle.yaml"
else
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 @@ -118,10 +121,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