Package Build Fixes Post Release Cycle (#1125)

* Update SUSE template for ARM32 bug.

* Fix permissions issue when building Alpine APK

* Allow alpine build to use dynamic agent.

* Prevent local APKINDEX build error

Author: steelhead31

linux/jdk/alpine/src/main/packaging/entrypoint.sh

@@ -8,6 +8,7 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace
 
 # Install Adoptium Public Key
 sudo chmod 664 /etc/apk/repositories
+sudo chmod 775 /etc/apk/keys
 sudo chgrp abuild /etc/apk/repositories
 sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
 sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories

linux/jre/alpine/src/main/packaging/entrypoint.sh

@@ -8,6 +8,7 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace
 
 # Install Adoptium Public Key
 sudo chmod 664 /etc/apk/repositories
+sudo chmod 775 /etc/apk/keys
 sudo chgrp abuild /etc/apk/repositories
 sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
 sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories

linux_new/Jenkinsfile

@@ -134,7 +134,7 @@ def getPackageBuildLabel(String arch, String distro) {
     switch (distro) {
         case 'APK':
             if (arch == 'x64') {
-                return 'linux&&build&&x64&&dockerBuild'
+                return 'build&&linux&&x64&&dockerBuild&&dynamicAzure'
             } else if (arch == 'aarch64') {
                 return 'build&&docker&&linux&&aarch64&&apkbuild'
             } else {

linux_new/jdk/alpine/src/main/packaging/entrypoint.sh

@@ -8,11 +8,16 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace
 
 # Install Adoptium Public Key
 sudo chmod 664 /etc/apk/repositories
+sudo chmod 775 /etc/apk/keys
 sudo chgrp abuild /etc/apk/repositories
 sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
 sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
 sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
 
+# As We Dont Build The Package Index We Dont Sign/Release It
+# This allows the build/test of the APK to succeed.
+export ABUILD_APK_INDEX_OPTS="--allow-untrusted"
+
 # Set permssions
 sudo chown -R builder /home/builder/out
 

linux_new/jdk/suse/src/main/packaging/temurin/8/temurin-8-jdk.template.j2

@@ -21,7 +21,6 @@
 
 %if "%{vers_arch}" == "armv7hl"
 %define vers_arch arm
-%global upstream_version {{ upstreamarm32_version }}
 %endif
 
 %if "%{vers_arch}" == "x86_64"
@@ -95,6 +94,11 @@ Provides: jre-%{java_provides}-headless
 Source0: %{source_url_base}/jdk%{upstream_version}/OpenJDK8U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_dash}.tar.gz
 Source1: %{source_url_base}/jdk%{upstream_version}/OpenJDK8U-jdk_%{vers_arch}_linux_hotspot_%{upstream_version_no_dash}.tar.gz.sha256.txt
 
+# Reset Upstream Version Ahead Of Package Build
+%if "%{vers_arch}" == "arm"
+%global upstream_version {{ upstreamarm32_version }}
+%endif
+
 # Avoid build failures on some distros due to missing build-id in binaries.
 %global debug_package %{nil}
 %global __brp_strip %{nil}

linux_new/jre/alpine/src/main/packaging/entrypoint.sh

@@ -8,11 +8,16 @@ cp -R /home/builder/build/generated/packaging /home/builder/workspace
 
 # Install Adoptium Public Key
 sudo chmod 664 /etc/apk/repositories
+sudo chmod 775 /etc/apk/keys
 sudo chgrp abuild /etc/apk/repositories
 sudo wget -O /etc/apk/keys/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
 sudo echo 'https://packages.adoptium.net/artifactory/apk/alpine/main' >> /etc/apk/repositories
 sudo wget -O /home/builder/.abuild/adoptium.rsa.pub https://packages.adoptium.net/artifactory/api/security/keypair/public/repositories/apk
 
+# As We Dont Build The Package Index We Dont Sign/Release It
+# This allows the build/test of the APK to succeed.
+export ABUILD_APK_INDEX_OPTS="--allow-untrusted"
+
 # Set permssions
 sudo chown -R builder /home/builder/out
 

linux_new/jre/suse/src/main/packaging/temurin/8/temurin-8-jre.template.j2

@@ -35,7 +35,6 @@ Prefix: /usr/lib/jvm/%{name}
 
 %if "%{vers_arch}" == "armv7hl"
 %define vers_arch arm
-%global upstream_version {{ upstreamarm32_version }}
 %endif
 
 %if "%{vers_arch}" == "x86_64"
@@ -77,6 +76,11 @@ Provides: jre-%{java_provides}-headless
 Source0: %{source_url_base}/jdk%{upstream_version}/OpenJDK8U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_dash}.tar.gz
 Source1: %{source_url_base}/jdk%{upstream_version}/OpenJDK8U-jre_%{vers_arch}_linux_hotspot_%{upstream_version_no_dash}.tar.gz.sha256.txt
 
+# Reset Upstream Version Ahead Of Package Build
+%if "%{vers_arch}" == "arm"
+%global upstream_version {{ upstreamarm32_version }}
+%endif
+
 # Avoid build failures on some distros due to missing build-id in binaries.
 %global debug_package %{nil}
 %global __brp_strip %{nil}