From 75573b0409eeabbd08f3a2801fd11c47078a249f Mon Sep 17 00:00:00 2001 From: Tomasz Wrobel Date: Thu, 5 Mar 2020 16:43:50 +0100 Subject: Add CSIT for Cert Service Client Issue-ID: AAF-996 Signed-off-by: Tomasz Wrobel Change-Id: If29633f8ce382c4bef2c14ff7ec9b5377c866d4a --- plans/aaf/certservice/setup.sh | 12 ++++++++++++ plans/aaf/certservice/teardown.sh | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) (limited to 'plans') diff --git a/plans/aaf/certservice/setup.sh b/plans/aaf/certservice/setup.sh index a89a1625..995b31d3 100644 --- a/plans/aaf/certservice/setup.sh +++ b/plans/aaf/certservice/setup.sh @@ -27,6 +27,18 @@ SCRIPTS_DIRECTORY="scripts" JENKINS_SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/$PROJECT_DIRECTORY/$SCRIPTS_DIRECTORY" LOCAL_SCRIPTS_PATH="$CURRENT_WORKDIR_PATH/$SCRIPTS_DIRECTORY" +# ------------------------------------ +#Prepare enviroment for client +#install docker sdk +echo "Uninstall docker-py and reinstall docker." +pip uninstall -y docker-py +pip uninstall -y docker +pip install -U docker==2.7.0 + +#export container name +export ClientContainerName=CertServiceClient +# ------------------------------------ + if test -d "$JENKINS_SCRIPTS_PATH"; then SCRIPTS_PATH=$JENKINS_SCRIPTS_PATH else test -f "$LOCAL_SCRIPTS_PATH"; diff --git a/plans/aaf/certservice/teardown.sh b/plans/aaf/certservice/teardown.sh index ab227596..0a9e0734 100644 --- a/plans/aaf/certservice/teardown.sh +++ b/plans/aaf/certservice/teardown.sh @@ -18,4 +18,5 @@ docker-compose down kill-instance.sh aafcert -kill-instance.sh aafcert-ejbca \ No newline at end of file +kill-instance.sh aafcert-ejbca +kill-instance.sh ${ClientContainerName} \ No newline at end of file -- cgit 1.2.3-korg