Revert "Build aarch32 (arm32/armv7l) builds from main repository inst…

…ead of the aarch32-specific one for April GA (adoptium#1655)"

This reverts commit 4937941.

configureBuild.sh

@@ -168,6 +168,8 @@ setRepository() {
   elif [[ "${BUILD_CONFIG[BUILD_VARIANT]}" == "${BUILD_VARIANT_CORRETTO}" ]]
   then
     suffix="corretto/corretto-${BUILD_CONFIG[OPENJDK_CORE_VERSION]:3}"
+  elif [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] && [ "${BUILD_CONFIG[OS_ARCHITECTURE]}" == "armv7l" ]; then
+    suffix="adoptopenjdk/openjdk-aarch32-jdk8u";
   else
     suffix="adoptopenjdk/openjdk-${BUILD_CONFIG[OPENJDK_FOREST_NAME]}";
   fi
@@ -235,7 +237,8 @@ processArgumentsforSpecificArchitectures() {
 
     "armv7l")
       if [ "${BUILD_CONFIG[OPENJDK_CORE_VERSION]}" == "${JDK8_CORE_VERSION}" ] && isHotSpot; then
-        jvm_variant=zero
+        jvm_variant=client
+        make_args_for_any_platform="DEBUG_BINARIES=true images"
       else
         jvm_variant=server,client
         make_args_for_any_platform="DEBUG_BINARIES=true images legacy-jre-image"