summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2023-03-27 06:30:30 -0400
committerJesse Luehrs <doy@tozt.net>2023-03-27 06:30:30 -0400
commite66e2ac91cfa8455a947fa67349da2216d8a47ee (patch)
tree9d7d66ee4ced7676419499dc96dd9d2f819bfe33
parente1ddad5701280279dceb80d00ca3e36e75e6ce23 (diff)
downloadpuppet-tozt-e66e2ac91cfa8455a947fa67349da2216d8a47ee.tar.gz
puppet-tozt-e66e2ac91cfa8455a947fa67349da2216d8a47ee.zip
some fixes to puppet-tozt
-rw-r--r--modules/base/files/puppet-tozt9
1 files changed, 8 insertions, 1 deletions
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