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

Backports changes from weekly to LTS 2.332 line #248

Merged
merged 33 commits into from
Jun 10, 2022
Merged

Conversation

dduportal
Copy link
Contributor

After jenkins-infra/helpdesk#2978 , safer to immediatly transplant all the changes to the LTS baseline.

cathychan and others added 30 commits March 9, 2022 20:28
Use rollback instead of rollblack
Remoting releases from older baselines (like stable-4.13.x) need to
deliver a signed jar file for compatibility. This pull request changes
the default branch used for remoting releases from release.ci.jenkins.io
to use the stable-4.13.x branch instead of the master branch.

Remoting development on the remoting master branch no longer
requires a signed jar file with the removal of Java Web Start in
jenkinsci/remoting#532

The release.ci.jenkins.io job that delivers remoting with signed jars
is no longer used for releases of the master branch of the remoting
repository.

This change should allow us to deliver remoting 4.13.1.  Remoting releases
from the master branch will continue to use JEP-229 as was done for
https://github.com/jenkinsci/remoting/releases/tag/3020.vcc32c3b_cc767
…4.13.x-branch

Release signed remoting from stable-4.13.x branch, not master branch
Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hervé Le Meur <91831478+lemeurherve@users.noreply.github.com>
…ava` binary

- jenkins-infra/docker-packaging#36 removed JDK8 and changed the `JAVA_HOME` value
- #237 and #232 changed the Docker image but we forgot to update the pod config
fix(release) Rely on the Docker image `PATH` to locate the default `java` binary
Ref. openssl/openssl#11672.
This is a short-term measure to fix the weekly release process.
fix(release) use openssl legacy provider for pkcs12
Display Maven version information without stopping build
…i/...

... jenkins-infra/release/PodTemplates.d/release-linux.yaml"

Made with ❤️️  by updatecli
…i/...

... jenkins-infra/release/PodTemplates.d/release-linux.yaml"

Made with ❤️️  by updatecli
…dbba8951cba27b0e8393f6419e599b857c5fa2ca3f32a917

[updatecli] Bump jenkinsciinfra/packaging Docker image version to 2.1.40
…i/...

... jenkins-infra/release/PodTemplates.d/package-linux.yaml"

Made with ❤️️  by updatecli
…i/...

... jenkins-infra/release/PodTemplates.d/package-linux.yaml"

Made with ❤️️  by updatecli
chore(Jenkinsfiles) remove deprecated label directive for kubernetes agent definitions
…dbba8951cba27b0e8393f6419e599b857c5fa2ca3f32a917

[updatecli] Bump jenkinsciinfra/packaging Docker image version
Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

Wouldn't it make more sense to merge these changes into stable-2.346? There is no further point release of 2.332 which would utilize the changes.

@dduportal
Copy link
Contributor Author

Wouldn't it make more sense to merge these changes into stable-2.346?

Absolutely: a twin PR is needed for that. Thanks for pointing that: I'm always lost in "which branch is which what".

However we still need this PR to ensure that any security release that would fork from the stable-2.332 would have these changes.

Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

There will be one more security release of this line so sure makes sense

packaging branch will also need merging then

Copy link
Member

@NotMyFault NotMyFault left a comment

Choose a reason for hiding this comment

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

There will be one more security release of this line so sure makes sense

Then we definitely want this here too 👍🏻

@dduportal
Copy link
Contributor Author

packaging branch will also need merging then

I'm not aware of any packaging branch, what are you refering to?

@dduportal dduportal merged commit 950ff21 into stable-2.332 Jun 10, 2022
@@ -7,15 +7,13 @@ metadata:
spec:
containers:
- name: jnlp
image: jenkinsciinfra/packaging:2.1.9
image: jenkinsciinfra/packaging:2.1.41
Copy link
Member

Choose a reason for hiding this comment

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

needs a backport of jenkinsci/jenkins#6628 to 2.332 and 2.346

Copy link
Contributor

Choose a reason for hiding this comment

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

Could this change be (partially) reverted instead?

Copy link
Member

Choose a reason for hiding this comment

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

packaging branch will also need merging then

I'm not aware of any packaging branch, what are you refering to?

https://github.com/jenkinsci/packaging/branches

Could this change be (partially) reverted instead?

Yes it would just need this version bump reverted

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hop: #252

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants