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

fix(helpdesk-3099) ensure that missing 2.346.x (jdk8 and jdk17-preview) images are published #1439

Merged
merged 23 commits into from
Aug 19, 2022

Conversation

dduportal
Copy link
Contributor

@dduportal dduportal commented Aug 18, 2022

Ref. jenkins-infra/helpdesk#3099

This PR introduces the following changes:

  • Bump jenkins plugin CLI to 2.12.8, because it's the version used on the current 2.346.2 and 2.346.3 published images from the master branch:
docker git:(fix/missing-2.346.x-images) ✗ docker run --rm --entrypoint=jenkins-plugin-cli jenkins/jenkins:2.346.1-lts-jdk11 --version
2.12.6docker git:(fix/missing-2.346.x-images) ✗ docker run --rm --entrypoint=jenkins-plugin-cli jenkins/jenkins:2.346.2-lts-jdk11 --version
2.12.8docker git:(fix/missing-2.346.x-images) ✗ docker run --rm --entrypoint=jenkins-plugin-cli jenkins/jenkins:2.346.3-lts-jdk11 --version
2.12.8

=> but only for JDK17 and JDK11. For JDK8, we are using 2.17.2, which is the latest version supported.

  • Linux images:

    • Ensure that only the 2.346.x are checked by the publication script

      $ bash ./.ci/publish.sh -n
      Docker repository in Use:
      * JENKINS_REPO: jenkins/jenkins
      Dry run, will not publish images
      Tag is already published: 2.346.1
      WARNING: could not get a valid manifest at the URL https://index.docker.io/v2/jenkins/jenkins/manifests/2.346.2-alpine-jdk17-preview.
        (For debugging purposes) manifest={"errors":[{"code":"MANIFEST_UNKNOWN","message":"manifest unknown","detail":"unknown tag=2.346.2-alpine-jdk17-preview"}]}
      2.346.2 not published yet
      Version 2.346.2 higher than 1.0: publishing 2.346.2 latest_weekly:false latest_lts:false
      WARNING: could not get a valid manifest at the URL https://index.docker.io/v2/jenkins/jenkins/manifests/2.346.3-alpine-jdk17-preview.
        (For debugging purposes) manifest={"errors":[{"code":"MANIFEST_UNKNOWN","message":"manifest unknown","detail":"unknown tag=2.346.3-alpine-jdk17-preview"}]}
      2.346.3 not published yet
      Version 2.346.3 higher than 1.0: publishing 2.346.3 latest_weekly:false latest_lts:true
    • Ensure that no jdk11 version is built (to avoid overriding images already published)

  • Cherry-picks from master:

  • Bumped JDK8 to latest available to benefit from last changes

(edit)

  • It should only build and test JDK8 images on public CI
  • It should only publish:
    • JDK8 images by building and publishing as usual
    • JDK17 "preview" images by copying from their already existing JDK17 images: same shasum to avoid surprises (instead of rebuilding it there), hence fulfilling the "least surprise" principle.

jenkins-dependency-updater bot and others added 20 commits August 18, 2022 19:14
… for JDK8

Signed-off-by: jenkins-dependency-updater <81680575+jenkins-dependency-updater[bot]@users.noreply.github.com>
(cherry picked from commit db736b6)
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
…linux images

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
(cherry picked from commit 1031fdd)
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
…nd fix SC2155 shellcheck violations

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
(cherry picked from commit 21975ce)
…t still work and that it prints a warning

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
(cherry picked from commit 9050fb4)
Bumps debian from bullseye-20220527-slim to bullseye-20220622-slim.

---
updated-dependencies:
- dependency-name: debian
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 054a1a1)
Bumps debian from bullseye-20220527 to bullseye-20220622.

---
updated-dependencies:
- dependency-name: debian
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 4b39899)
Co-authored-by: Mark Waite <mark.earl.waite@gmail.com>
Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
(cherry picked from commit cb89835)
(cherry picked from commit e400fd8)
* Update default value of Jenkins version

* Try and fix tests

* Fix ps1

* Minimize diff

* Remove HTML from regex

* facepalm

(cherry picked from commit 4d817e0)
Bumps debian from bullseye-20220622-slim to bullseye-20220711-slim.

---
updated-dependencies:
- dependency-name: debian
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 7937472)
Bumps alpine from 3.16.0 to 3.16.1.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 24b8a76)
Bumps debian from bullseye-20220711 to bullseye-20220801.

---
updated-dependencies:
- dependency-name: debian
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 8a85825)
Bumps debian from bullseye-20220711-slim to bullseye-20220801-slim.

---
updated-dependencies:
- dependency-name: debian
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 249e1ca)
Bumps alpine from 3.16.1 to 3.16.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 94dffc2)
Bumps alpine from 3.16.1 to 3.16.2.

---
updated-dependencies:
- dependency-name: alpine
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 3347dd8)
(cherry picked from commit d8d4c11)
@dduportal dduportal force-pushed the fix/missing-2.346.x-images branch from 35bf5e7 to a98f3cb Compare August 18, 2022 17:15
@dduportal dduportal marked this pull request as ready for review August 18, 2022 17:16
@dduportal dduportal requested review from olivergondza and a team as code owners August 18, 2022 17:16
@dduportal
Copy link
Contributor Author

There are still test error with the JDK17, when passing custom JVM_OPTS or JENKINS_..._OPTS option.

Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the test errors you're seeing were fixed on the main branch in #1409 and/or #1411.

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
… from their jdk17 counterpart

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal
Copy link
Contributor Author

I think the test errors you're seeing were fixed on the main branch in #1409 and/or #1411.

Thanks @basil ! Given the temporary character of this branch (that should be used a few times for publication), I've adapted the behavior:

  • It should only build and test JDK8 images on public CI
  • It should only publish:
    • JDK8 images by building and publishing as usual
    • JDK17 "preview" images by copying from their already existing JDK17 images: same shasum to avoid surprises (instead of rebuilding it there), hence fulfilling the "least surprise" principle.

WDYT folks?

Copy link
Member

@basil basil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@dduportal dduportal merged commit 5598ea1 into jenkinsci:stable-2.346 Aug 19, 2022
@dduportal dduportal deleted the fix/missing-2.346.x-images branch August 19, 2022 19:56
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.

6 participants