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

Update jenkins-agent.sh to work on ARM Macs #38693

Merged
merged 2 commits into from
Jan 27, 2025
Merged

Conversation

cailafinn
Copy link
Contributor

@cailafinn cailafinn commented Jan 24, 2025

Description of work

Summary of work

The new arm macs don't work with the legacy versions of the jenkins agent jar file that the old x86 macs rely upon. Modify the script to take this into account.

Purpose of work

Allows the new arm macs to make use of the same script as the existing ones, keeping our deployment system as similar as possible.

There is no associated issue.

To test:

  1. Check that the script runs and connects on both an old x86 runner and on a new ARM runner.

This does not require release notes because no user-facing changes have occurred.


Reviewer

Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.

Code Review

  • Is the code of an acceptable quality?
  • Does the code conform to the coding standards?
  • Are the unit tests small and test the class in isolation?
  • If there is GUI work does it follow the GUI standards?
  • If there are changes in the release notes then do they describe the changes appropriately?
  • Do the release notes conform to the release notes guide?

Functional Tests

  • Do changes function as described? Add comments below that describe the tests performed?
  • Do the changes handle unexpected situations, e.g. bad input?
  • Has the relevant (user and developer) documentation been added/updated?

Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will take care of it.

Gatekeeper

If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.

The new arm macs don't work with the legacy versions of the jenkins agent jar file that the old x86 macs rely upon. Modify the script to take this into account.
@cailafinn cailafinn added Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) DevOps Issues and pull requests related to DevOps labels Jan 24, 2025
@cailafinn cailafinn added this to the Release 6.13 milestone Jan 24, 2025
@sf1919 sf1919 added the High Priority An issue or pull request that if not addressed is severe enough to postponse a release. label Jan 27, 2025
@MialLewis MialLewis self-assigned this Jan 27, 2025
Copy link
Contributor

@MialLewis MialLewis left a comment

Choose a reason for hiding this comment

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

Looks good, couple of stylistic comments.

buildconfig/Jenkins/jenkins-agent.sh Outdated Show resolved Hide resolved
buildconfig/Jenkins/jenkins-agent.sh Outdated Show resolved Hide resolved
@cailafinn cailafinn force-pushed the jenkins-agent_arm_mac branch from 7f0215a to 72540ef Compare January 27, 2025 11:05
@cailafinn cailafinn requested a review from MialLewis January 27, 2025 13:26
Copy link
Contributor

@MialLewis MialLewis left a comment

Choose a reason for hiding this comment

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

LGTM.

Haven't tested the changes, but as this is not part of the workbench package I don't think this is necessary.

@SilkeSchomann SilkeSchomann self-assigned this Jan 27, 2025
@SilkeSchomann SilkeSchomann merged commit da27bda into main Jan 27, 2025
10 checks passed
@SilkeSchomann SilkeSchomann deleted the jenkins-agent_arm_mac branch January 27, 2025 15:12
@cailafinn cailafinn restored the jenkins-agent_arm_mac branch January 27, 2025 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) DevOps Issues and pull requests related to DevOps High Priority An issue or pull request that if not addressed is severe enough to postponse a release.
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants