From f81a1ce5b6fa5a99483d89950cff22a7c96ec246 Mon Sep 17 00:00:00 2001 From: Ankit Date: Mon, 3 Jun 2019 18:56:27 +0530 Subject: [PATCH 1/2] changes to run the interop testsuite against RI as GF 5.0 and VI as latest eclipse GF --- Jenkinsfile | 3 +++ docker/run_jakartaeetck.sh | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 18281762bc..d39ae7ed49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -132,6 +132,9 @@ spec: string(name: 'GF_VERSION_URL', defaultValue: '', description: 'URL required for downloading GlassFish version details' ) + string(name: 'OLD_GF_BUNDLE_URL', + defaultValue: '', + description: 'URL required for downloading Old GlassFish Full/Web profile bundle' ) string(name: 'TCK_BUNDLE_BASE_URL', defaultValue: '', description: 'Base URL required for downloading prebuilt binary TCK Bundle from a hosted location' ) diff --git a/docker/run_jakartaeetck.sh b/docker/run_jakartaeetck.sh index a590965d27..2534458400 100755 --- a/docker/run_jakartaeetck.sh +++ b/docker/run_jakartaeetck.sh @@ -93,9 +93,16 @@ if [ -z "${GF_BUNDLE_URL}" ]; then fi fi wget --progress=bar:force --no-cache $GF_BUNDLE_URL -O ${CTS_HOME}/latest-glassfish.zip +if [[ "interop" == ${test_suite} ]]; then + wget --progress=bar:force --no-cache $OLD_GF_BUNDLE_URL -O ${CTS_HOME}/glassfish-5.0.zip +fi rm -Rf ${CTS_HOME}/ri mkdir -p ${CTS_HOME}/ri -unzip ${CTS_HOME}/latest-glassfish.zip -d ${CTS_HOME}/ri +if [[ "interop" == ${test_suite} ]]; then + unzip ${CTS_HOME}/glassfish-5.0.zip -d ${CTS_HOME}/ri +else + unzip ${CTS_HOME}/latest-glassfish.zip -d ${CTS_HOME}/ri +fi chmod -R 777 ${CTS_HOME}/ri export ADMIN_PASSWORD_FILE="${CTS_HOME}/admin-password.txt" From dcceed93240aed41f1a0170a878e555c48c96a6d Mon Sep 17 00:00:00 2001 From: Ankit Date: Mon, 3 Jun 2019 19:42:13 +0530 Subject: [PATCH 2/2] changes to run the interop testsuite against RI as GF 5.0 and VI as latest eclipse GF --- docker/run_jakartaeetck.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/run_jakartaeetck.sh b/docker/run_jakartaeetck.sh index 2534458400..14149aac1b 100755 --- a/docker/run_jakartaeetck.sh +++ b/docker/run_jakartaeetck.sh @@ -92,6 +92,9 @@ if [ -z "${GF_BUNDLE_URL}" ]; then export GF_BUNDLE_URL=$DEFAULT_GF_BUNDLE_URL fi fi +if [ -z "${OLD_GF_BUNDLE_URL}" ]; then + export OLD_GF_BUNDLE_URL=$GF_BUNDLE_URL +fi wget --progress=bar:force --no-cache $GF_BUNDLE_URL -O ${CTS_HOME}/latest-glassfish.zip if [[ "interop" == ${test_suite} ]]; then wget --progress=bar:force --no-cache $OLD_GF_BUNDLE_URL -O ${CTS_HOME}/glassfish-5.0.zip