From 4c99a1a126d6cc8caef1bed83ce6cf5ce4f2536e Mon Sep 17 00:00:00 2001
From: Alex Iribarren <Alex.Iribarren@cern.ch>
Date: Wed, 30 Jun 2021 09:32:10 +0200
Subject: [PATCH] Run puppet tests as well
---
test-nonironic.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/test-nonironic.sh b/test-nonironic.sh
index 1b0ba93..9659171 100755
--- a/test-nonironic.sh
+++ b/test-nonironic.sh
@@ -43,6 +43,7 @@ for f in "${FLAVOR[@]}"; do
testCreate "${TESTTYPE}-${f}" "create"
testCreate "${TESTTYPE}-${f}" "install"
testCreate "${TESTTYPE}-${f}" "ssh_access"
+ testCreate "${TESTTYPE}-${f}" "puppet_tests"
done
# Poor man's FIFO queue
@@ -250,6 +251,18 @@ while [[ ${#TOBETESTED[@]} -gt 0 ]]; do
runOnServer "${p_name}" "fdisk -l; cat /proc/mdstat"
t_CheckExitStatus $?
+ t_Log "We're in! Running Puppet tests"
+ testStart "${TESTTYPE}-${flavor}" "puppet_tests"
+ runOnServer "${p_name}" "PUPPET_TEST_TOKEN="${PUPPET_TEST_TOKEN}" bash -s" < ./puppettests.sh
+ g=$?
+ t_CheckExitStatus $g
+ if [[ $g -ne 0 ]]; then
+ testEnd "${TESTTYPE}-${flavor}" "puppet_tests" $TEST_FAIL
+ testAddComments "${TESTTYPE}-${flavor}" "puppet_tests" "Puppet tests failed"
+ else
+ testEnd "${TESTTYPE}-${flavor}" "puppet_tests" $TEST_PASS
+ fi
+
# Remove the server
aimsDelete "${p_name}" "${TESTTYPE}-${flavor}" "ssh_access"
deleteServer "${p_name}" "${TESTTYPE}-${flavor}" "ssh_access"
--
GitLab