From e66e2ac91cfa8455a947fa67349da2216d8a47ee Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 27 Mar 2023 06:30:30 -0400 Subject: some fixes to puppet-tozt --- modules/base/files/puppet-tozt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/base/files/puppet-tozt b/modules/base/files/puppet-tozt index 5c98bfa..4a48ff1 100644 --- a/modules/base/files/puppet-tozt +++ b/modules/base/files/puppet-tozt @@ -4,4 +4,11 @@ set -o pipefail branch=${1:-main} (cd /usr/local/share/puppet-tozt && sudo git remote update && sudo git checkout -B "$branch" && sudo git submodule update --init --recursive && sudo git reset --hard "origin/$branch") -sudo ruby -W0 /usr/bin/puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules --hiera_config=/usr/local/share/puppet-tozt/hiera/hiera.yaml /usr/local/share/puppet-tozt/manifests + +set +e +sudo puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules --hiera_config=/usr/local/share/puppet-tozt/hiera/hiera.yaml --detailed-exitcodes /usr/local/share/puppet-tozt/manifests +if [ $? -eq 2 ]; then + exit 0 +else + exit $? +fi \ No newline at end of file -- cgit v1.2.3-54-g00ecf