Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert Ubuntu 22.04/ JDK8-removal changes for stable 2.332 #252

Merged
merged 4 commits into from
Jun 14, 2022
Merged

Revert Ubuntu 22.04/ JDK8-removal changes for stable 2.332 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3050c0
Update package-linux.yaml
dduportal Jun 13, 2022
df222de
Update release-linux.yaml
dduportal Jun 13, 2022
733bcf3
Update release.bash
dduportal Jun 13, 2022
c6d1ad4
Update release-linux.yaml
dduportal Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PodTemplates.d/package-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion PodTemplates.d/release-linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 1 addition & 8 deletions utils/release.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand All @@ -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" \
Expand Down