From 74783063dfc3782a5553954016d2e475993ce2fe Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 27 Jul 2016 15:40:19 -0400 Subject: [PATCH 1/5] Trying to root the script invocation --- tests/download.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/download.bats b/tests/download.bats index f434ece..320054a 100644 --- a/tests/download.bats +++ b/tests/download.bats @@ -3,7 +3,7 @@ load ../common setup() { - bin/download.sh + ./bin/download.sh } @test "Downloads a Shibboleth IDP tree" { From b36e2276967f4cca2595107ddc2dd47d35e29c7d Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 27 Jul 2016 15:46:21 -0400 Subject: [PATCH 2/5] Adding logs check --- tests/download.bats | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/download.bats b/tests/download.bats index 320054a..2ce98bb 100644 --- a/tests/download.bats +++ b/tests/download.bats @@ -14,4 +14,9 @@ setup() { @test "Prunes Shibboleth IDP binaries" { run ls root/bin [ "$status" -eq 1 ] +} + +@test "Prunes Shibboleth IDP logs" { + run ls root/logs + [ "$status" -eq 1 ] } \ No newline at end of file From 07acccacdf0c2033dd8c335cca953d028506c683 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 27 Jul 2016 15:59:55 -0400 Subject: [PATCH 3/5] Checking on working directory during bats invocation --- .gitignore | 1 + tests/download.bats | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9ed152d..f9b8692 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ bin/run.sh bin/test.sh root/** shibboleth-identity-provider.tar.gz +test.log diff --git a/tests/download.bats b/tests/download.bats index 2ce98bb..658f280 100644 --- a/tests/download.bats +++ b/tests/download.bats @@ -3,6 +3,7 @@ load ../common setup() { + echo $PWD > test.log ./bin/download.sh } @@ -19,4 +20,4 @@ setup() { @test "Prunes Shibboleth IDP logs" { run ls root/logs [ "$status" -eq 1 ] -} \ No newline at end of file +} From a456eefdf484fa36283efed85b5295ac3f53fc79 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 27 Jul 2016 16:08:41 -0400 Subject: [PATCH 4/5] Trying find --- tests/download.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/download.bats b/tests/download.bats index 658f280..7077da4 100644 --- a/tests/download.bats +++ b/tests/download.bats @@ -13,11 +13,11 @@ setup() { } @test "Prunes Shibboleth IDP binaries" { - run ls root/bin + run find root/bin [ "$status" -eq 1 ] } @test "Prunes Shibboleth IDP logs" { - run ls root/logs + run find root/logs [ "$status" -eq 1 ] } From 686de177fbb5a84e5936cf9e05239d5eca36ea5e Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 27 Jul 2016 16:12:10 -0400 Subject: [PATCH 5/5] Adding badge --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8542f76..9b58954 100644 --- a/README.md +++ b/README.md @@ -1 +1,7 @@ -# shib-conftree +# shib-idp-conftree + +[![Build Status](https://jenkins.testbed.tier.internet2.edu/buildStatus/icon?job=docker/shib-idp-conftree/master)](https://jenkins.testbed.tier.internet2.edu/job/docker/job/shib-idp-conftree/job/master/) + +## Purpose + +This repository will serve as an interim pipeline for our finished Shibboleth IDP container image process. We may refactor later, but managing the configuration tree inline makes sense right now.