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

Pin previous credentials-binding release for LTS profiles #2514

Conversation

MarkEWaite
Copy link
Contributor

Pin previous credentials-binding release for LTS profiles

The most recent release of the credentials-binding plugin adds masking for base64 credentials. That's a nice improvement. Unfortunately, it causes one of the config-file-provider tests to fail.

Adapt older bom profiles to "Bump credentials-binding (#2509)" by retaining the current version of the credentials binding plugin on the weekly release and pinning the previous credentials binding plugin release on the LTS releases.

Could exclude the test failure on all releases, but it seemed better to be able to detect test failures from the weekly release even if we can't yet test the new version with the LTS releases.

This partially reverts commit bab8257.

Testing done

Confirmed that the failing config-file-provider tests now pass. Used the build.sh script like this to bisect with git bisect run:

#!/bin/bash

git clean -xffd
# mvn -am -pl war,bom -Pquick-build clean install
# mvn -pl war -Dhost=0.0.0.0 jetty:run

logfile=logfile-$(date --rfc-3339=seconds | sed 's, ,-,g')

git log -n 1 > ../$logfile

export LINE=2.414.x
export PLUGINS=config-file-provider
export TEST=MavenSettingsConfigTest
bash local-test.sh >> ../$logfile 2>&1 

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

The most recent release of the credentials-binding plugin adds masking
for base64 credentials.  That's a nice improvement.  Unfortunately,
it causes one of the config-file-provider tests to fail.

Adapt older bom profiles to "Bump credentials-binding (jenkinsci#2509)" by
retaining the current version of the credentials binding plugin on
the weekly release and pinning the previous credentials binding plugin
release on the LTS releases.

Could exclude the test failure on all releases, but it seemed better
to be able to detect test failures from the weekly release even if we
can't yet test the new version with the LTS releases.

This partially reverts commit bab8257.
@MarkEWaite MarkEWaite requested a review from a team as a code owner September 16, 2023 22:56
@MarkEWaite MarkEWaite added the full-test Test all LTS lines in this PR and do not halt upon first error. label Sep 16, 2023
@MarkEWaite MarkEWaite enabled auto-merge (squash) September 16, 2023 22:57
@MarkEWaite MarkEWaite disabled auto-merge September 17, 2023 02:33
@MarkEWaite
Copy link
Contributor Author

With 560+ passing tests and progress not being updated in several minutes, I'm taking the preemptive step to merge this so that the next stage in release preparation can continue.

Once that is completed successfully, then a full build of the master branch will be run so that it can be released. Probably 12-15 hours more before the release will be complete.

@MarkEWaite MarkEWaite merged commit c111cf5 into jenkinsci:master Sep 17, 2023
@MarkEWaite MarkEWaite deleted the adapt-to-config-file-provider-test-failure-from-credentials-binding branch September 17, 2023 03:29
@MarkEWaite MarkEWaite added the bug Something isn't working label Sep 17, 2023
MarkEWaite added a commit that referenced this pull request Sep 17, 2023
MarkEWaite added a commit that referenced this pull request Sep 18, 2023
)"

The config-file-provider plugin 959.vcff671a_4518b_ release resolves
the test failure on LTS lines.

jenkinsci/config-file-provider-plugin#296 is
the pull request to config-file-provider that resolved the issue.

https://github.com/jenkinsci/config-file-provider-plugin/releases/tag/959.vcff671a_4518b_
is the changelog for the config-file-provider release.

This reverts commit c111cf5.
github-actions bot pushed a commit that referenced this pull request Sep 18, 2023
…4d2 to 959.vcff671a_4518b_ in /bom-weekly (#2517)

* Bump org.jenkins-ci.plugins:config-file-provider in /bom-weekly

Bumps [org.jenkins-ci.plugins:config-file-provider](https://github.com/jenkinsci/config-file-provider-plugin) from 953.v0432a_802e4d2 to 959.vcff671a_4518b_.
- [Release notes](https://github.com/jenkinsci/config-file-provider-plugin/releases)
- [Commits](https://github.com/jenkinsci/config-file-provider-plugin/commits)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:config-file-provider
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* Revert "Pin previous credentials-binding release for LTS profiles (#2514)"

The config-file-provider plugin 959.vcff671a_4518b_ release resolves
the test failure on LTS lines.

jenkinsci/config-file-provider-plugin#296 is
the pull request to config-file-provider that resolved the issue.

https://github.com/jenkinsci/config-file-provider-plugin/releases/tag/959.vcff671a_4518b_
is the changelog for the config-file-provider release.

This reverts commit c111cf5.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Waite <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working full-test Test all LTS lines in this PR and do not halt upon first error.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

config-file-provider plugin fails MavenSettingsConfigTest.freestyleWithCredentials test
1 participant