summaryrefslogtreecommitdiffstats
path: root/plans/aaf/certservice
diff options
context:
space:
mode:
authorTomasz Wrobel <tomasz.wrobel@nokia.com>2020-03-05 16:43:50 +0100
committerTomasz Wrobel <tomasz.wrobel@nokia.com>2020-03-10 13:04:29 +0100
commit75573b0409eeabbd08f3a2801fd11c47078a249f (patch)
tree47a6f52a7eb3f3a57677dcd082fd6c03a210c8c7 /plans/aaf/certservice
parentb133879ebd28e6e8c6cbb65534ac361f2a7550a8 (diff)
Add CSIT for Cert Service Client
Issue-ID: AAF-996 Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com> Change-Id: If29633f8ce382c4bef2c14ff7ec9b5377c866d4a
Diffstat (limited to 'plans/aaf/certservice')
-rw-r--r--plans/aaf/certservice/setup.sh12
-rw-r--r--plans/aaf/certservice/teardown.sh3
2 files changed, 14 insertions, 1 deletions
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