Do not tag instances if no serverUrl #319
Merged
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
This is probably more sensible than my previous attempt. *Anyway* the number of production instances out there without a serverUrl is probably close to 0, but well.
|
Tested successfully by building a local package and manual upload. Going to do a second check on a freshly provisioned setup as soon as ci.jenkins.io builds the incremental release for this PR. |
batmat
changed the title
|
Just confirmed this works on a fresh instance. Sorry for the mishaps on #314. |
batmat
commented
Nov 7, 2018
| @@ -377,8 +367,8 @@ private int countCurrentEC2Slaves(SlaveTemplate template) throws AmazonClientExc | |||
| jenkinsServerUrl = jenkinsLocation.getUrl(); | |||
|
|
|||
| if (jenkinsServerUrl == null) { | |||
| LOGGER.log(Level.WARNING, "No Jenkins server URL specified, using instance-identity instead"); | |||
| jenkinsServerUrl = getInstanceIdentityEncodedPublicKey(); | |||
There was a problem hiding this comment.
not trying anymore to be smart for no good reason, just warn and not crash if serverUrl is unspecified.
jvz
approved these changes
Nov 7, 2018
|
any chance we can get a release with this soon? |
|
We should release in the beginning of next week, i have two pending task the pr 321 and fix the CAP |
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.
https://issues.jenkins-ci.org/browse/JENKINS-54266
This is probably more sensible than my previous attempt on #314, and in the end matches what @thoulen was saying would probably have been preferrable: we just do not tag in case there's no serverUrl.
It's also a followup of #310, for inter-tracking purpose.
Anyway the number of production instances out there without a
serverUrlis probably close to 0, but well.