Fixed errors in paths for Oracle CTS runs

Signed-off-by: anajosep <anand.francis.joseph.augustin@oracle.com>
jakartaee · Jan 29, 2019 · cce5264 · cce5264
1 parent 6598d94
commit cce5264
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/docker/build_jakartaeetck.sh b/docker/build_jakartaeetck.sh
@@ -40,9 +40,12 @@ if [ ! -z "$TCK_BUNDLE_BASE_URL" ]; then
    if [ "$?" == "0" ]; then
      echo "Bundle contains required scripts to run the tests"
    else
-     zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip docker/run_jakartaeetck.sh
-     zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip docker/build_jakartaeetck.sh
-     zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip docker/fix_classpaths.sh
+     mkdir javaeetck
+     cp -R docker javaeetck
+     zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip javaeetck/docker/run_jakartaeetck.sh
+     zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip javaeetck/docker/build_jakartaeetck.sh
+     zip -u ${WORKSPACE}/jakartaeetck-bundles/jakartaeetck.zip javaeetck/docker/fix_classpaths.sh
+     rm -rf javaeetck
    fi
 
    if [ ! -z "$GF_VERSION_URL" ]; then

diff --git a/docker/fix_classpaths.sh b/docker/fix_classpaths.sh
@@ -1,13 +1,4 @@
 #!/bin/bash -x
-
-if [[ ! -f ${WORKSPACE}/javaeetck/docker/run_jakartaeetck.sh ]]; then
-  mkdir ${WORKSPACE}/javaeetck/docker
-  chmod 777 ${WORKSPACE}/javaeetck/docker
-  cp ${WORKSPACE}/docker/*.sh ${WORKSPACE}/javaeetck/docker
-  chmod +x ${WORKSPACE}/javaeetck/docker/*.sh
-
-fi
-
 sed -i 's/javax.annotation.jar/jakarta.annotation-api.jar/g' ${WORKSPACE}/javaeetck/bin/ts.jte
 sed -i 's/jaxb-api.jar/jakarta.xml.bind-api.jar/g' ${WORKSPACE}/javaeetck/bin/ts.jte
 sed -i 's/javax.annotation-api.jar/jakarta.annotation-api.jar/g' ${WORKSPACE}/javaeetck/bin/ts.jte