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.

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

Conversation

dduportal
Copy link
Contributor

@dduportal dduportal commented Jun 13, 2022

The PR #248 should not have been raised and merged as JDK8 should still be used to build this version line.

The current PR only rollbacks the changes related to JDK8/Ubuntu but keep the rest (doc, chores, etc.).

  • jenkins-infra/docker-packaging@2.1.9...2.1.32
  • Using the latest image as posible to benefits from @basil 's work on the systemd macros: is this LTS the correct target?
  • Reverted the openssl command (related to Ubuntu 22.04) change
  • Reverted the java bin path for spawning the inbound agent
$ docker run --rm -ti --entrypoint=openssl jenkinsciinfra/packaging:2.1.32 pkcs12 --help 2>&1 | grep legacy
$ docker run --rm -ti --entrypoint=openssl jenkinsciinfra/packaging:2.1.41 pkcs12 --help 2>&1 | grep legacy
 -legacy             Use legacy encryption: 3DES_CBC for keys, RC2_CBC for certs
$ docker run --rm -ti --entrypoint=/opt/jdk-11/bin/java jenkinsciinfra/packaging:2.1.32 -version                        
openjdk version "11.0.13" 2021-10-19
OpenJDK Runtime Environment Temurin-11.0.13+8 (build 11.0.13+8)
OpenJDK 64-Bit Server VM Temurin-11.0.13+8 (build 11.0.13+8, mixed mode)
$ docker run --rm -ti --entrypoint=/opt/jdk-8/bin/java jenkinsciinfra/packaging:2.1.32 -version
openjdk version "1.8.0_312"
OpenJDK Runtime Environment (Temurin)(build 1.8.0_312-b07)
OpenJDK 64-Bit Server VM (Temurin)(build 25.312-b07, mixed mode)

@dduportal dduportal changed the title Update package-linux.yaml Revert Ubuntu 22.04/ JDK8-removal changes for stable 2.332 Jun 13, 2022
@dduportal dduportal requested review from timja and daniel-beck June 13, 2022 14:33
@dduportal dduportal marked this pull request as ready for review June 13, 2022 14:33
@dduportal dduportal merged commit 1d298bb into stable-2.332 Jun 14, 2022
@dduportal dduportal deleted the revert-248-stable-2.332 branch June 14, 2022 04:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants