Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

JENKINS-74974 - Adapt Scriptler test to use preferred terminology #1859

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

mtughan
Copy link
Contributor

@mtughan mtughan commented Dec 10, 2024

JENKINS-74974 - Adapt to Scriptler 390+

Scriptler 390 and above use "(built-in)" to refer to the built-in node instead of "(controller)" or "(master)" (jenkinsci/scriptler-plugin#128). Update the test harness to check for any of these terms.

The adaptation code can be simplified once older versions of the Scriptler plugin are no longer being tested.

Testing done

Tested the Scriptler unit tests locally.

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

@MarkEWaite
Copy link
Contributor

Thanks very much @mtughan

@MarkEWaite MarkEWaite changed the title JENKINS-74974 - Adapt to Scriptler 390+ JENKINS-74974 - Adapt Scriptler test to use preferred terminology for controller Dec 10, 2024
@MarkEWaite MarkEWaite changed the title JENKINS-74974 - Adapt Scriptler test to use preferred terminology for controller JENKINS-74974 - Adapt Scriptler test to use preferred terminology Dec 10, 2024
@MarkEWaite MarkEWaite mentioned this pull request Dec 10, 2024
8 tasks
@mtughan
Copy link
Contributor Author

mtughan commented Dec 10, 2024

I missed that JDK 17 would use an older version of Jenkins which installs an older version of the plugin without the name change. Let me work on fixing it now.

Scriptler 390 and above use "(built-in)" to refer to the built-in node
instead of "(controller)" or "(master)". Update the test harness to
check for any of these terms.

The adaptation code can be simplified once older versions of the
Scriptler plugin are no longer being tested.
@MarkEWaite MarkEWaite enabled auto-merge (squash) December 10, 2024 15:44
@MarkEWaite MarkEWaite merged commit 470620c into jenkinsci:master Dec 10, 2024
25 checks passed
@mtughan mtughan deleted the JENKINS-74974 branch December 10, 2024 17:08
@basil basil mentioned this pull request Feb 6, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants