SQUASHME: Stop filename from depending on unset variables

Signed-off-by: Stewart X Addison <[email protected]>
adoptium · Feb 24, 2021 · b12a4cd · b12a4cd
1 parent 35f47c9
commit b12a4cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/ansible/pbTestScripts/buildJDK.sh b/ansible/pbTestScripts/buildJDK.sh
@@ -131,18 +131,18 @@ if [[ "$(uname -m)" == "armv7l" && "$VARIANT" == "openj9" ]]; then
 	export VARIANT=hotspot
 fi
 
-export FILENAME="${JAVA_TO_BUILD}_${VARIANT}_${ARCHITECTURE}"
-
-echo "DEBUG:
-        TARGET_OS=$TARGET_OS
-        ARCHITECTURE=$ARCHITECTURE
-        JAVA_TO_BUILD=$JAVA_TO_BUILD
-        VARIANT=$VARIANT
-        JDK_BOOT_DIR=$JDK_BOOT_DIR
-        JAVA_HOME=$JAVA_HOME
-        WORKSPACE=$WORKSPACE
-        GIT_URL=$GIT_URL
-        FILENAME=$FILENAME"
+export FILENAME="java.tar.gz"
+
+echo "buildJDK.sh DEBUG:
+        TARGET_OS=${TARGET_OS:-}
+        ARCHITECTURE=${ARCHITECTURE:-}
+        JAVA_TO_BUILD=${JAVA_TO_BUILD:-}
+        VARIANT=${VARIANT:-}
+        JDK_BOOT_DIR=${JDK_BOOT_DIR:-}
+        JAVA_HOME=${JAVA_HOME:-}
+        WORKSPACE=${WORKSPACE:-}
+        GIT_URL=${GIT_URL:-}
+        FILENAME=${FILENAME:-}"
 
 cloneRepo 
 

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -66,7 +66,7 @@
     - role: ccache
       when: ansible_distribution != "Solaris" # Compile fails on Solaris
     - role: nasm                  # OpenJ9
-      when: ansible_architecture == 'x86_z64'
+      when: ansible_architecture == 'x86_64'
       tags: [build_tools, build_tools_openj9]
     - role: zulu7                 # JDK8 Build Bootstrap
       when: ansible_distribution != "MacOSX"