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

chore(updatecli) Re-enable JDK updates #371

Merged
merged 5 commits into from
Mar 22, 2024

Conversation

gounthar
Copy link
Contributor

@gounthar gounthar commented Mar 22, 2024

Updatecli now requires us to specify a more precise platform: linux/amd64 instead of amd64, windows/amd64 instead of amd64, and so forth.

This change mirrors the adjustments made in this PR and serves as a precursor to #370.
Please note that I have reintroduced an arm64 target in the checks for Alpine, as it is available.
Although it was defined in the Docker bake file, it was never checked for in the updatecli manifest.

The JDK updates were delayed for some time because we had not yet transitioned to this new formalism.
This should fix it. 🤞

Testing done

updatecli diff --config ./updatecli/updatecli.d/jdk11.yaml --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml
updatecli diff --config ./updatecli/updatecli.d/jdk17.yaml --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml
updatecli diff --config ./updatecli/updatecli.d/jdk21.yaml --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml

Submitter checklist

  • Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
  • Ensure that the pull request title represents the desired changelog entry
  • Please describe what you did
  • Link to relevant issues in GitHub or Jira
  • Link to relevant pull requests, esp. upstream and downstream changes
  • Ensure you have provided tests - that demonstrates feature works or fixes the issue

Updatecli now wants us to get a more precise platform:  `linux/amd64` instead of `amd/64`, `windows/amd64` instead of `amd64`, and so on.
Updatecli now wants us to get a more precise platform:  `linux/amd64` instead of `amd/64`, `windows/amd64` instead of `amd64`, and so on.
@gounthar gounthar requested a review from a team as a code owner March 22, 2024 08:14
@gounthar
Copy link
Contributor Author

On a side note, why don't we have debian_jdk17?

make list
+ make --silent show
+ jq -r .target | path(.. | select(.platforms[] | contains("linux/amd64"))?) | add
#1 [internal] load local bake definitions
#1 reading docker-bake.hcl 6.23kB / 6.23kB done
#1 DONE 0.0s
alpine_jdk11
alpine_jdk17
alpine_jdk21
debian_jdk11
debian_jdk21

@lemeurherve
Copy link
Member

On a side note, why don't we have debian_jdk17?

make list
+ make --silent show
+ jq -r .target | path(.. | select(.platforms[] | contains("linux/amd64"))?) | add
#1 [internal] load local bake definitions
#1 reading docker-bake.hcl 6.23kB / 6.23kB done
#1 DONE 0.0s
alpine_jdk11
alpine_jdk17
alpine_jdk21
debian_jdk11
debian_jdk21

Because you removed it in #309 ^^
519ac2f#diff-870f6fe23fc034f008f5203ee1e628d7bfa65a49095d5a4688db498328449ed2

@lemeurherve
Copy link
Member

I think it should be restored (in a distinct PR).

@gounthar
Copy link
Contributor Author

Ouch!

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.

Run Summary
===========
Pipeline(s) run:
  * Changed:	3
  * Failed:	0
  * Skipped:	0
  * Succeeded:	6
  * Total:	9

with:

  • JDK21 upgrade: path "variable.JAVA21_VERSION.default" updated from "21.0.1_12" to "21.0.2_13" in file "docker-bake.hcl"
  • JDK17 upgrade: path "variable.JAVA17_VERSION.default" updated from "17.0.8.1_1" to "17.0.10_7" in file "docker-bake.hcl"
  • JDK11 upgrade: path "variable.JAVA11_VERSION.default" updated from "11.0.20.1_1" to "11.0.22_7" in file "docker-bake.hcl"

@dduportal dduportal changed the title feat(updatecli) Re-enable JDK updates chore(updatecli) Re-enable JDK updates Mar 22, 2024
@dduportal dduportal merged commit 393725c into jenkinsci:master Mar 22, 2024
4 checks passed
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.

None yet

3 participants