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(updatecli/debian): add new jdk21 and jdk21-preview conditions and targets #1744

Merged
merged 6 commits into from
Oct 22, 2023

Conversation

lemeurherve
Copy link
Member

@lemeurherve lemeurherve commented Oct 22, 2023

This PR adds new jdk21 and jdk21-preview conditions and targets in the debian updatecli manifest.

Also, the manifest has been renamed from bulleyes.yaml to debian.yaml, and the conditions and targets have been reordered to regroup them by jdk versions (easier to work with).

EDIT: manifest renamed separately in #1745 so the primary branch will have the same filename to be able to run updatecli on this PR.

EDIT again: the issue wasn't related to the filename but to the fact two conditions shared the same name.

Follow-up of #1738

Testing done

https://github.com/jenkinsci/docker/actions/runs/6603465838/job/17936592388

Submitter checklist

@lemeurherve
Copy link
Member Author

LGTM:

TARGETS
========

updateDockerfileJDK17
---------------------

**Dry Run enabled**

✔ The line #1, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is correctly set to "ARG BOOKWORM_TAG=20231009".
✔ - 

updateDockerfileJDK21SlimPreview
--------------------------------

**Dry Run enabled**

⚠ The line #1, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is changed from "ARG BOOKWORM_TAG=20230904" to "ARG BOOKWORM_TAG=20231009".
⚠ - changed lines [1] of file "/tmp/updatecli/github/jenkinsci/docker/21/debian/bookworm-slim/hotspot/preview/Dockerfile"

updateDockerfileJDK21Slim
-------------------------

**Dry Run enabled**

⚠ The line #1, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is changed from "ARG BOOKWORM_TAG=20230904" to "ARG BOOKWORM_TAG=20231009".
⚠ - changed lines [1] of file "/tmp/updatecli/github/jenkinsci/docker/21/debian/bookworm-slim/hotspot/Dockerfile"

updateDockerfileJDK21
---------------------

**Dry Run enabled**

⚠ The line #1, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is changed from "ARG BOOKWORM_TAG=20230904" to "ARG BOOKWORM_TAG=20231009".
⚠ - changed lines [1] of file "/tmp/updatecli/github/jenkinsci/docker/21/debian/bookworm/hotspot/Dockerfile"

updateDockerfileJDK17Slim
-------------------------

**Dry Run enabled**

✔ The line #1, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is correctly set to "ARG BOOKWORM_TAG=20231009".
✔ - 

updateDockerfileJDK11
---------------------

**Dry Run enabled**

✔ The line #2, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is correctly set to "ARG BOOKWORM_TAG=20231009".
✔ - 

updateDockerBake
----------------

**Dry Run enabled**

✔ - all contents from 'file' and 'files' combined already up to date

updateDockerfileJDK11Slim
-------------------------

**Dry Run enabled**

✔ The line #2, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is correctly set to "ARG BOOKWORM_TAG=20231009".
✔ - 

updateDockerfileJDK21Preview
----------------------------

**Dry Run enabled**

⚠ The line #1, matched by the keyword "ARG" and the matcher "BOOKWORM_TAG", is changed from "ARG BOOKWORM_TAG=20230904" to "ARG BOOKWORM_TAG=20231009".
⚠ - changed lines [1] of file "/tmp/updatecli/github/jenkinsci/docker/21/debian/bookworm/hotspot/preview/Dockerfile"

@lemeurherve lemeurherve changed the title fix(updatecli): add new jdk21 and jdk21-preview conditions and targets fix(updatecli/debian): add new jdk21 and jdk21-preview conditions and targets Oct 22, 2023
Copy link
Contributor

@dduportal dduportal left a comment

Choose a reason for hiding this comment

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

The updatecli diff proposed changes looks good! great work 👍

@lemeurherve lemeurherve merged commit 544eda3 into jenkinsci:master Oct 22, 2023
18 checks passed
@lemeurherve lemeurherve deleted the fix-bookworm-manifest branch October 22, 2023 12:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants