Merge pull request #252 from jenkins-infra/revert-248-stable-2.332

Revert Ubuntu 22.04/ JDK8-removal changes for stable 2.332
jenkins-infra · Jun 14, 2022 · 1d298bb · 1d298bb
2 parents 950ff21 + c6d1ad4
commit 1d298bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/PodTemplates.d/package-linux.yaml b/PodTemplates.d/package-linux.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   containers:
     - name: jnlp
-      image: jenkinsciinfra/packaging:2.1.41
+      image: jenkinsciinfra/packaging:2.1.32
       imagePullPolicy: "IfNotPresent"
       env:
         - name: "HOME"

diff --git a/PodTemplates.d/release-linux.yaml b/PodTemplates.d/release-linux.yaml
@@ -7,13 +7,15 @@ metadata:
 spec:
   containers:
     - name: jnlp
-      image: jenkinsciinfra/packaging:2.1.41
+      image: jenkinsciinfra/packaging:2.1.32
       imagePullPolicy: "IfNotPresent"
       env:
         - name: "HOME"
           value: "/home/jenkins/agent/workspace"
         - name: "MAVEN_OPTS"
           value: "-Xmx8g -Xms8g"
+        - name: "JENKINS_JAVA_BIN"
+          value: "/opt/jdk-11/bin/java"
       resources:
         limits:
           memory: "16Gi"

diff --git a/utils/release.bash b/utils/release.bash
@@ -77,7 +77,6 @@ function configureKeystore(){
   case "$SIGN_CERTIFICATE" in
     *.pem )
       openssl pkcs12 -export \
-        -legacy `# https://github.com/openssl/openssl/issues/11672` \
         -out "$SIGN_KEYSTORE" \
         -in "${SIGN_CERTIFICATE}" \
         -password "pass:$SIGN_STOREPASS" \
@@ -86,14 +85,8 @@ function configureKeystore(){
     *.pfx )
       # pfx file download from azure key vault are not password protected, which is required for maven release plugin
       # so we need to add a new password
-      openssl pkcs12 \
-        -in "${SIGN_CERTIFICATE}" \
-        -legacy `# https://github.com/openssl/openssl/issues/11672` \
-        -out tmpjenkins.pem \
-        -nodes \
-        -passin pass:""
+      openssl pkcs12 -in "${SIGN_CERTIFICATE}" -out tmpjenkins.pem -nodes -passin pass:""
       openssl pkcs12 -export \
-        -legacy `# https://github.com/openssl/openssl/issues/11672` \
         -out "$SIGN_KEYSTORE" \
         -in tmpjenkins.pem \
         -password "pass:$SIGN_STOREPASS" \