From c3c56ada9a38a811f8a7e491ae609ae57b4d2952 Mon Sep 17 00:00:00 2001 From: wangyan Date: Thu, 26 Jul 2018 19:39:16 -0700 Subject: [PATCH] Add Notary server endpoint as a parameter for the CI test cases --- tests/integration.sh | 8 ++++---- tests/resources/Harbor-Util.robot | 6 +++--- tests/robot-cases/Group0-BAT/BAT.robot | 2 +- tests/robot-cases/Group11-Nightly/Common.robot | 2 +- .../robot-cases/Group9-Content-trust/notary-push-image.sh | 7 ++++--- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/integration.sh b/tests/integration.sh index 90a6f209a..23853c43e 100755 --- a/tests/integration.sh +++ b/tests/integration.sh @@ -150,17 +150,17 @@ fi if (echo $buildinfo | grep -q "\[Specific CI="); then buildtype=$(echo $buildinfo | grep "\[Specific CI=") testsuite=$(echo $buildtype | awk -F"\[Specific CI=" '{sub(/\].*/,"",$2);print $2}') - pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip --removekeywords TAG:secret --suite $testsuite tests/robot-cases + pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --suite $testsuite tests/robot-cases elif (echo $buildinfo | grep -q "\[Full CI\]"); then - pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip --removekeywords TAG:secret --exclude skip tests/robot-cases + pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --exclude skip tests/robot-cases elif (echo $buildinfo | grep -q "\[Skip CI\]"); then echo "Skip CI." elif (echo $buildinfo | grep -q "\[Upload Build\]"); then package_offline_installer - pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip --removekeywords TAG:secret --include BAT tests/robot-cases/Group0-BAT + pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --include BAT tests/robot-cases/Group0-BAT else # default mode is BAT. - pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip --removekeywords TAG:secret --include BAT tests/robot-cases/Group0-BAT + pybot -v HARBOR_ADMIN:$HARBOR_ADMIN -v HARBOR_PASSWORD:$HARBOR_PASSWORD -v ip:$container_ip -v notaryServerEndpoint:$container_ip:4443 --removekeywords TAG:secret --include BAT tests/robot-cases/Group0-BAT fi # rc is used to identify test run pass or fail. diff --git a/tests/resources/Harbor-Util.robot b/tests/resources/Harbor-Util.robot index 5bb5f427e..7843c919a 100644 --- a/tests/resources/Harbor-Util.robot +++ b/tests/resources/Harbor-Util.robot @@ -102,17 +102,17 @@ Enable Notary Client Log ${ip} ${rc}= Run And Return Rc mkdir -p /etc/docker/certs.d/${ip}/ Should Be Equal As Integers ${rc} 0 - ${rc}= Run And Return Rc mkdir -p ~/.docker/tls/${ip}:4443/ + ${rc}= Run And Return Rc mkdir -p ~/.docker/tls/${notaryServerEndpoint}/ Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output cp ./harbor_ca.crt /etc/docker/certs.d/${ip}/ Log ${output} Should Be Equal As Integers ${rc} 0 - ${rc} ${output}= Run And Return Rc And Output cp ./harbor_ca.crt ~/.docker/tls/${ip}:4443/ + ${rc} ${output}= Run And Return Rc And Output cp ./harbor_ca.crt ~/.docker/tls/${notaryServerEndpoint}/ Log ${output} Should Be Equal As Integers ${rc} 0 ${rc} ${output}= Run And Return Rc And Output ls -la /etc/docker/certs.d/${ip}/ Log ${output} - ${rc} ${output}= Run And Return Rc And Output ls -la ~/.docker/tls/${ip}:4443/ + ${rc} ${output}= Run And Return Rc And Output ls -la ~/.docker/tls/${notaryServerEndpoint}/ Log ${output} Prepare diff --git a/tests/robot-cases/Group0-BAT/BAT.robot b/tests/robot-cases/Group0-BAT/BAT.robot index 9e3d1c7b5..1b9aaec15 100644 --- a/tests/robot-cases/Group0-BAT/BAT.robot +++ b/tests/robot-cases/Group0-BAT/BAT.robot @@ -54,7 +54,7 @@ Test Case - Notary Basic Verfication Log ${output} Push image ${ip} %{HARBOR_ADMIN} %{HARBOR_PASSWORD} library hello-world:latest - ${rc} ${output}= Run And Return Rc And Output ./tests/robot-cases/Group9-Content-trust/notary-push-image.sh ${ip} + ${rc} ${output}= Run And Return Rc And Output ./tests/robot-cases/Group9-Content-trust/notary-push-image.sh ${ip} ${notaryServerEndpoint} Log ${output} Should Be Equal As Integers ${rc} 0 diff --git a/tests/robot-cases/Group11-Nightly/Common.robot b/tests/robot-cases/Group11-Nightly/Common.robot index ef261ca07..e7413aeae 100644 --- a/tests/robot-cases/Group11-Nightly/Common.robot +++ b/tests/robot-cases/Group11-Nightly/Common.robot @@ -616,7 +616,7 @@ Test Case - Admin Push Signed Image Log ${output} Push image ${ip} ${HARBOR_ADMIN} ${HARBOR_PASSWORD} library hello-world:latest - ${rc} ${output}= Run And Return Rc And Output ./tests/robot-cases/Group9-Content-trust/notary-push-image.sh ${ip} + ${rc} ${output}= Run And Return Rc And Output ./tests/robot-cases/Group9-Content-trust/notary-push-image.sh ${ip} ${notaryServerEndpoint} Log ${output} Should Be Equal As Integers ${rc} 0 diff --git a/tests/robot-cases/Group9-Content-trust/notary-push-image.sh b/tests/robot-cases/Group9-Content-trust/notary-push-image.sh index 71272d9e9..4db45e0ee 100755 --- a/tests/robot-cases/Group9-Content-trust/notary-push-image.sh +++ b/tests/robot-cases/Group9-Content-trust/notary-push-image.sh @@ -3,12 +3,14 @@ docker pull tomcat:latest IP=$1 +notaryServerEndpoint=$2 PASSHRASE='Harbor12345' echo $IP +echo "Notary server endpoint: $notaryServerEndpoint" export DOCKER_CONTENT_TRUST=1 -export DOCKER_CONTENT_TRUST_SERVER=https://$IP:4443 +export DOCKER_CONTENT_TRUST_SERVER=https://$notaryServerEndpoint export NOTARY_ROOT_PASSPHRASE=$PASSHRASE export NOTARY_TARGETS_PASSPHRASE=$PASSHRASE @@ -20,5 +22,4 @@ export DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE=$PASSHRASE docker login -u admin -p Harbor12345 $IP docker tag tomcat $IP/library/tomcat:latest -docker push $IP/library/tomcat:latest - +docker push $IP/library/tomcat:latest \ No newline at end of file