Skip to content

Commit

Permalink
back to bats
Browse files Browse the repository at this point in the history
  • Loading branch information
pcaskey committed Nov 10, 2022
1 parent 3f5ae46 commit affdbff
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
8 changes: 4 additions & 4 deletions tests/fulltest.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit affdbff

Please sign in to comment.