Fix start script for OIDC integration test (#33)

* Fix tests.
servicecatalog · Nov 19, 2020 · 180431a · 180431a
1 parent e08a759
commit 180431a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/shared/cleanup.groovy b/shared/cleanup.groovy
@@ -83,8 +83,8 @@ void execute() {
                 if [ ! -d ${WORKSPACE}/docker ]; then
                     mkdir ${WORKSPACE}/docker;
                 else
-                    docker run --rm -v ${WORKSPACE}/docker:/docker busybox mv /docker/var.env /docker/var.env.bak-jenkins
-                    docker run --rm -v ${WORKSPACE}/docker:/docker busybox mv /docker/.env /docker/.env.bak-jenkins    
+                    docker run --rm -v ${WORKSPACE}/docker:/docker busybox  mv /docker/var.env "/docker/var.env.$(date -Iseconds)"     
+                    docker run --rm -v ${WORKSPACE}/docker:/docker busybox mv /docker/.env "/docker/.env.$(date -Iseconds)"
                 fi;
             fi;
             '''

diff --git a/shared/start.groovy b/shared/start.groovy
@@ -52,13 +52,15 @@ void execute(String FQDN = env.NODE_NAME + '.intern.est.fujitsu.com') {
             // (this is because sed needs permission to create a temp file in this directory!)
             sh '''
             docker run --rm -v ${WORKSPACE}/docker:/docker busybox chown $(id -u jenkins):$(id -g jenkins) /docker
+            mkdir -p ${WORKSPACE}/docker/config/oscm-identity/tenants/
             docker run \
                 --name deployer1 \
                 --rm \
                 -v ${WORKSPACE}/docker:/target \
                 -e SAMPLE_DATA=${SAMPLE_DATA} \
                 ${DOCKER_REGISTRY}/${DOCKER_ORGANIZATION}/oscm-deployer:${DOCKER_TAG}
             '''
+
         }
     }