From 27a056c30b2914fc890bd2acfad6176059d088c3 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Wed, 9 Nov 2022 23:14:42 +0000 Subject: [PATCH] testing --- Jenkinsfile | 2 +- tests/fulltest.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 98c613c..08dd4ec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,7 +74,7 @@ pipeline { script { try { echo "Starting tests..." - sh 'bin/test.sh 2>&1 | tee debug ; test ${PIPESTATUS[0]} -eq 0' + sh "bin/test.sh 2>&1 | tee debug ; test ${PIPESTATUS[0]} -eq 0" // ===> 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 326a786..fdd4fd0 100755 --- a/tests/fulltest.sh +++ b/tests/fulltest.sh @@ -1,4 +1,5 @@ #!/bin/bash +echo "Starting fulltest.sh script..." . ./common.bash @@ -45,8 +46,7 @@ rm -f ./lastpage.txt #fi # replace FROM line in IdP Dockerfile to newly-built local image -# sed -i "/FROM/c\FROM ${imagename}_${tag}" ../test-compose/idp/Dockerfile -sed -i "/FROM/c\FROM shib-idp_4.2.1_20221101_rocky8_multiarch_dev" ../test-compose/idp/Dockerfile +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..." #webisoget -verbose -out ./lastpage.txt -formfile ./sptest.login -url https://sptest.example.edu:8443/secure/index.php