From affdbff67c3a2411541370cf087943ab09a02d73 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Thu, 10 Nov 2022 01:27:01 +0000 Subject: [PATCH] back to bats --- Jenkinsfile | 4 ++-- tests/fulltest.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 55b6fb8..e844f0f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,8 +74,8 @@ pipeline { script { try { echo "Starting tests..." - // sh "bin/test.sh 2>&1 | tee debug ; test ${PIPESTATUS[0]} -eq 0" - sh 'tests/fulltest.sh' + sh "bin/test.sh 2>&1 | tee debug ; test ${PIPESTATUS[0]} -eq 0" + // sh 'tests/fulltest.sh' // ===> need bats, webisoget on jenkins node, also need to send/set correct image name // echo "Skipping tests for now" } catch (error) { diff --git a/tests/fulltest.sh b/tests/fulltest.sh index 5c29581..b6f41fe 100755 --- a/tests/fulltest.sh +++ b/tests/fulltest.sh @@ -1,15 +1,15 @@ #!/bin/bash -echo "Starting fulltest.sh script..." +echo "Starting fulltest.sh script..." >&3 . ./common.bash pushd test-compose &>/dev/null -echo "Launching fresh containers..." +echo "Launching fresh containers..." >&3 ./decompose.sh -y &>/dev/null ./compose.sh &>/dev/null popd &>/dev/null -echo "Waiting 1 minute while everything comes up..." +echo "Waiting 1 minute while everything comes up..." >&3 sleep 60 pushd tests &>/dev/null @@ -48,7 +48,7 @@ rm -f ./lastpage.txt # replace FROM line in IdP Dockerfile to newly-built local image sed -i "s*FROM i2incommon/shib-idp:latest*FROM shib-idp_4.2.1_20221101_rocky8_multiarch_dev*g" ../test-compose/idp/Dockerfile -echo "Attempting full-cycle test..." +echo "Attempting full-cycle test..." >&3 #webisoget -verbose -out ./lastpage.txt -formfile ./sptest.login -url https://sptest.example.edu:8443/secure/index.php #build docker container