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

Jump to bottom

Fix(stable-2.346) remove hacks to allow publishing all JDKs for 2.346.x LTS line #1448

Merged
merged 7 commits into from
Aug 25, 2022
Merged

Fix(stable-2.346) remove hacks to allow publishing all JDKs for 2.346.x LTS line #1448

merged 7 commits into from
Aug 25, 2022

Conversation

dduportal
Copy link
Contributor

@dduportal dduportal commented Aug 25, 2022 •
edited
Loading

Note: as preliminary to this PR, I've manually republished the missing jdk17-prevoew images manually as the publish script seems to have failed for some.

This PR removes most of the short hacks that were added to this branch to fix the missing JDK8 images for 2.346.2 and 2.346.3.

It's caused by #1441, setting the ground to allow publishing futur LTS image releases for this line.

It introduces the following changes:

  • Add back the JDK11 and JDK17 builds (reverts dduportal@dc26917)
  • Add back the JDK11 and JDK17 publications (reverts dduportal@e6b995f)
  • Ensure that all JDK17 images are now built and published with both jdk17 and jdk17-preview (and removes the hack in publish script that was skopeo-copying images).
  • Cherry pick Update version we test against #1409 and Update default value of Jenkins version #1411 for fixing tests
  • Cleanup the docker-bake to stop passing (unused) build args to JKD8 (which now have a fixed version of the jenkins-plugin-cli that should never be upgraded anymore as the next version dropped the JDK8 support)
  • Cherry pick missing base OS updates

@dduportal dduportal marked this pull request as ready for review August 25, 2022 09:19
@dduportal dduportal requested a review from a team as a code owner August 25, 2022 09:19
@dduportal
feat: ensure that JDK17 images are publish with both '-preview' prefi…
cbe9a3e 
…x and no prefix

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal dduportal force-pushed the fix/remove-hacks-for-stable-2.346-lts branch from 3eaa08a to cbe9a3e Compare August 25, 2022 09:27
timja and others added 2 commits August 25, 2022 11:28
@timja @dduportal
Update version we test against (jenkinsci#1409)
092e6ae 
(cherry picked from commit f471a2f)
@basil @dduportal
Update default value of Jenkins version (jenkinsci#1411)
160bfd1 
* Update default value of Jenkins version

* Try and fix tests

* Fix ps1

* Minimize diff

* Remove HTML from regex

* facepalm

(cherry picked from commit 4d817e0)
@dduportal dduportal marked this pull request as draft August 25, 2022 09:32
@dduportal
chore(docker-bake) remove unused build arg for JDK8 builds
ed2d81e 
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal
feat: cherry-pick missing base image updates
c630be5 
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal dduportal requested a review from timja August 25, 2022 09:41
@dduportal dduportal marked this pull request as ready for review August 25, 2022 09:41
@dduportal dduportal merged commit 96bbc34 into jenkinsci:stable-2.346 Aug 25, 2022
@dduportal dduportal deleted the fix/remove-hacks-for-stable-2.346-lts branch August 25, 2022 10:14
This was referenced Aug 25, 2022
Merged
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timja timja timja approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dduportal @timja @basil