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

Revert script security 1367.x and workflow-cps 3975.x #3869

Merged
merged 2 commits into from
Oct 30, 2024

Conversation

MarkEWaite
Copy link
Contributor

Revert script security 1367.x and workflow-cps 3975.x

Lockable resources tests fail with a message "Maybe need to rebuild plugin". While we investigate, let's keep the master branch of the bom build able to release.

Testing done

Used git bisect to identify the first failing change from script security update. The workflow-cps change must be reverted as well because it depends on the script security update.

Ran this command before the change and confirmed the failure. Same commmand after the change passes the tests.

LINE=weekly PLUGINS=lockable-resources bash local-test.sh

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

…enkinsci#3860)"

Fails tests in lockable resources plugin with report that a plugin
rebuild may be required.

This reverts commit 90a163e.
…kly (jenkinsci#3861)"

Matches the script security change that was rolled back in
84bf35f

This reverts commit dbc37df.
@MarkEWaite MarkEWaite requested a review from a team as a code owner October 30, 2024 16:51
@MarkEWaite MarkEWaite added bug Something isn't working full-test Test all LTS lines in this PR and do not halt upon first error. labels Oct 30, 2024
@darinpope
Copy link
Contributor

The full stacktrace from the test failure:

[ERROR] org.jenkins.plugins.lockableresources.util.SerializableSecureGroovyScriptTest.testRehydrate -- Time elapsed: 0.372 s <<< ERROR!
java.lang.IllegalStateException: maybe need to rebuild plugin?
	at org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval.get(ScriptApproval.java:153)
	at org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SecureGroovyScript.<init>(SecureGroovyScript.java:99)
	at org.jenkins.plugins.lockableresources.util.SerializableSecureGroovyScriptTest.testRehydrate(SerializableSecureGroovyScriptTest.java:17)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)

@darinpope darinpope merged commit eabe7da into jenkinsci:master Oct 30, 2024
808 of 809 checks passed
@jglick
Copy link
Member

jglick commented Oct 30, 2024

jenkinsci/lockable-resources-plugin#725 it is just a bad test which could be excluded temporarily.

@MarkEWaite MarkEWaite deleted the revert-script-security branch October 31, 2024 04:01
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.

3 participants