-
Notifications
You must be signed in to change notification settings - Fork 690
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
[JENKINS-56839] Allow disabling T2/T3 Unlimited Mode for T3 instances #375
Open
Tblue
wants to merge
6
commits into
jenkinsci:master
Choose a base branch
from
Tblue:JENKINS-56839
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6f91732
[JENKINS-56839] Allow explicitly disabling T2/T3 Unlimited Mode.
Tblue 800068b
[JENKINS-56839] Verify correctness of CPU credit option in AWS requests.
Tblue 65d24f3
[JENKINS-56839] Fix tests.
Tblue 01ee44a
[JENKINS-56839] Add tests for JCasC backward compatibility.
Tblue e49ae4c
[JENKINS-56839] JCasC: Test interaction of t2Unlimited and burstableU…
Tblue e59ca87
[JENKINS-56839] Address code review suggestions.
Tblue File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/main/resources/hudson/plugins/ec2/SlaveTemplate/help-burstableUnlimitedMode.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<div> | ||
<p> | ||
Choose whether to enable | ||
<a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/burstable-performance-instances-unlimited-mode.html" | ||
>Unlimited Mode for Burstable Performance Instances</a> (T2, T3, and T3a). | ||
</p> | ||
<p>Unlimited Mode can incur additional charges.</p> | ||
<p> | ||
<em>Instance Type Default</em> will use the AWS default for the chosen Instance Type: T2 instances by default | ||
launch with Unlimited Mode disabled; T3 and T3a instances by default launch with Unlimited Mode enabled. | ||
</p> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder whether
t2Unlimited
should maybe be removed completely from this constructor and be made into a (deprecated)DataBoundSetter
instead (to make it clear thatt2Unlimited
is deprecated; its presence in theDataBoundConstructor
signature might be confusing).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just realized that this would break the migration of
t2Unlimited
, unless we move that fromreadResolve()
back to e. g.getBurstableUnlimitedMode()
... So let's leave things like they are for now.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can do it this way, it removes the Deprecated field from the ctor to make it less confusing.
ec2-plugin/src/main/java/hudson/plugins/ec2/SlaveTemplate.java
Line 423 in 597af44
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, right. I will look into that.