update solarissimple dotests.sh to allow artifact copying in jenkins (#4253)

* update solarissimple dotests.sh to allow artifact copying in jenkins

Signed-off-by: Stewart X Addison <[email protected]>

* Remove commented out sections at end now testing is complete

Signed-off-by: Stewart X Addison <[email protected]>

* update invocation of test job in simplepipe.groovy

Signed-off-by: Stewart X Addison <[email protected]>

* Placate linter

Signed-off-by: Stewart X Addison <[email protected]>

---------

Signed-off-by: Stewart X Addison <[email protected]>

Author: sxa

sbin/solaris/dotests.sh

@@ -12,6 +12,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 # ********************************************************************************
+# shellcheck disable=SC2006
+#
+# dotests.sh
+# Designed for running via a proxy machine for the Temurin Solaris tests
+# Expects the build under test to be either in $PWD/build_artifacts or
+# an accessible job name specified as UPSTREAM_JOBLINK e.g.
+# https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-x64-temurin-simplepipe/167
+#
+# Requires two parameters for the name of the test suite to run e.g.
+# ./dotests.sh sanity openjdk
+#
 
 if [ `uname -m` = i86pc ]; then ADOPTARCH=x64; else ADOPTARCH=sparcv9; fi
 # Check for Xvfb on display :5
@@ -33,17 +44,25 @@ else
   rm -rf aqa-tests
   git clone https://github.com/adoptium/aqa-tests
   cd aqa-tests
-  [ -z "$UPSTREAM_JOBLINK" ] && UPSTREAM_JOBLINK=https://ci.adoptium.net/job/build-scripts/job/jobs/job/jdk8u/job/jdk8u-solaris-${ADOPTARCH}-temurin-simple/lastSuccessfulBuild
-  # Linter can go do one if it objects to the backticks - "$(" is not understood by Solaris' bourne shell
-  JDK_TARBALL_NAME=`curl -s "${UPSTREAM_JOBLINK}/artifact/workspace/target/filenames.txt" | grep "OpenJDK8U-jdk_.*tar.gz$"`
-  [ -z "$JDK_TARBALL_NAME" ] && echo "Could not retrieve filenames.txt from $UPSTREAM_JOBLINK" && exit 1
-  echo Downloading and extracting JDK tarball ...
-  curl -O "${UPSTREAM_JOBLINK}/artifact/workspace/target/$JDK_TARBALL_NAME" || exit 1
+  if [ -z "${UPSTREAM_JOBLINK}" ]; then
+    # Jenkins simpletest job will copy the artifacts to this location
+    if [ ! -r "$PWD/build_artifacts/filenames.txt" ]; then
+       echo "dotests.sh : UPSTREAM_JOBLINK not defined and $PWD/build_artifacts/filenames.txt does not exist" - cannot progress
+       exit 1
+    fi
+    JDK_TARBALL_NAME=$PWD/build_artifacts/`cat $PWD/build_artifacts/filenames.txt | grep "OpenJDK8U-jdk_.*tar.gz$"`
+  else
+    # Linter can go do one if it objects to the backticks - "$(" is not understood by Solaris' bourne shell (SC2006)
+    JDK_TARBALL_NAME=`curl -s "${UPSTREAM_JOBLINK}/artifact/workspace/target/filenames.txt" | grep "OpenJDK8U-jdk_.*tar.gz$"`
+    [ -z "$JDK_TARBALL_NAME" ] && echo "Could not retrieve filenames.txt from $UPSTREAM_JOBLINK" && exit 1
+    echo Downloading and extracting JDK tarball ...
+    curl -O "${UPSTREAM_JOBLINK}/artifact/workspace/target/$JDK_TARBALL_NAME" || exit 1
+  fi
   gzip -cd "$JDK_TARBALL_NAME" | tar xpf -
   echo Downloading and extracting JRE tarball ... Required for special.openjdk jdk_math_jre_0 target
   JRE_TARBALL_NAME="`echo $JDK_TARBALL_NAME | sed s/jdk/jre/`"
   if [ "$1" = "special" -a "$2" = "openjdk" ]; then
-    curl -O "${UPSTREAM_JOBLINK}/artifact/workspace/target/$JRE_TARBALL_NAME" || exit 1
+    [ ! -z "${UPSTREAM_JOBLINK}" ] && curl -O "${UPSTREAM_JOBLINK}/artifact/workspace/target/$JRE_TARBALL_NAME" || exit 1
     gzip -cd "$JRE_TARBALL_NAME" | tar xpf -
   fi
 fi

sbin/solaris/simplepipe.groovy

@@ -83,7 +83,8 @@ node('worker') {
             warnError("The command failed") {
                 testJob = build job: "${jobTest}",
                 parameters: [
-                    string( name: 'UPSTREAM_JOBLINK', value: "${jobBaseLink}pipe/${env.BUILD_ID}")
+                    string( name: 'UPSTREAM_JOB_NAME', value: "${jobBaseName}pipe"),
+                    string( name: 'UPSTREAM_JOB_NUMBER', value: "${env.BUILD_ID}"),
                 ]
             }
         }