Tag slave instances to their jenkins master #274
Closed
Conversation
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
…o distinguish them between masters.
|
Even so it creates a very big conflict with my PR (#252), it would be very good to have something like this in place. Few things on top of review:
At the end, in current state PR should work if user does not:
|
Jimilian
suggested changes
Apr 10, 2018
| @@ -383,6 +389,9 @@ private int countCurrentEC2Slaves(SlaveTemplate template) throws AmazonClientExc | |||
| filters.add(new Filter("launch.image-id", values)); | |||
| } | |||
|
|
|||
| // The instances must match the jenkins server url | |||
| filters.add(new Filter("tag:" + EC2Tag.TAG_NAME_JENKINS_SERVER_URL + "=" + jenkinsServerUrl)); | |||
There was a problem hiding this comment.
if user specified EC2Tag.TAG_NAME_JENKINS_SERVER_URL manually, this line will break instance cap calculation.
| @@ -475,6 +484,15 @@ private int countCurrentEC2Slaves(SlaveTemplate template) throws AmazonClientExc | |||
| return n; | |||
| } | |||
|
|
|||
| private boolean isEc2ProvisionedJenkinsSlave(List<Tag> tags, String serverUrl) { | |||
There was a problem hiding this comment.
imho, it would be better to use getCustomInstanceTags here and compare list of tags from instance with expected tags.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This replaces PR #271 that had the wrong starting branch.
In the case where you have multiple Jenkins masters using the same configuration (same AMI for multiple clouds), the instance cap is shared between all instances and clouds. The workaround is to add an additional tag with the Jenkins url to have this instance cap unique per Jenkins master.