Skip to content
Permalink
Browse files
Merge pull request #187 from tjbaker/offline
JENKINS-33945 allow node provisioning when matching node is offline
  • Loading branch information
Francis Upton IV committed Mar 31, 2016
2 parents e3bfb31 + 8226bdb commit 1227f790c1049a24094ae503aab2ce5ea89cdf36
Showing 1 changed file with 12 additions and 7 deletions.
@@ -1,16 +1,16 @@
/*
* The MIT License
*
*
* Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributors
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
* Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
@@ -404,7 +404,12 @@ private boolean checkInstance(PrintStream logger, Instance existingInstance, EC2
if (!node.toComputer().isPartiallyIdle()) {
logProvision(logger, " false - Node is not partially idle");
return false;
} else {
}
else if (node.toComputer().isOffline()) {
logProvision(logger, " false - Node is offline");
return false;
}
else {
logProvision(logger, " true - Node has capacity - can use it");
returnNode[0] = node;
return true;
@@ -823,7 +828,7 @@ private KeyPair getKeyPair(AmazonEC2 ec2) throws IOException, AmazonClientExcept
/**
* Update the tags stored in EC2 with the specified information. Re-try 5 times if instances isn't up by
* catchErrorCode - e.g. InvalidSpotInstanceRequestID.NotFound or InvalidInstanceRequestID.NotFound
*
*
* @param ec2
* @param inst_tags
* @param catchErrorCode
@@ -1111,7 +1116,7 @@ private ArrayList<String> getAvailabilityZones(AmazonEC2 ec2) {

/**
* Populates the Bid Type Drop down on the slave template config.
*
*
* @return
*/
public ListBoxModel doFillBidTypeItems() {

0 comments on commit 1227f79

Please sign in to comment.