Skip to content

Guest Info add JNLP Secret variable #1

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.

Sign up for GitHub

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

Open
segator wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Guest Info add JNLP Secret variable #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68fa7ca
Guest Info add JNLP Secret to
Sep 18, 2016
89f721c
reduce UUID Hex VM name to MAX_RADIX
Sep 18, 2016
55c3ac1
Reduice UUID Hex Vm name to MAX_RADIX
Sep 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/org/jenkinsci/plugins/vSphereCloud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import hudson.util.StreamTaskListener;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Expand Down Expand Up @@ -401,7 +402,7 @@ public static VSpherePlannedNode createInstance(final CloudProvisioningState alg
final vSphereCloudSlaveTemplate template = whatWeShouldSpinUp.getTemplate();
final String cloneNamePrefix = template.getCloneNamePrefix();
final int numberOfExecutors = template.getNumberOfExecutors();
final UUID cloneUUID = UUID.randomUUID();
final String cloneUUID = Long.toString(ByteBuffer.wrap(UUID.randomUUID().toString().getBytes()).getLong(), Character.MAX_RADIX);
final String nodeName = cloneNamePrefix + "_" + cloneUUID;
final Callable<Node> provisionNodeCallable = new Callable<Node>() {
public Node call() throws Exception {
Expand Down
83 changes: 45 additions & 38 deletions src/main/java/org/jenkinsci/plugins/vSphereCloudSlaveTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.jenkinsci.plugins;

import com.cloudbees.plugins.credentials.common.StandardUsernameCredentials;
Expand Down Expand Up @@ -58,6 +57,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import jenkins.slaves.JnlpSlaveAgentProtocol;

import org.jenkinsci.plugins.vsphere.VSphereGuestInfoProperty;
import org.jenkinsci.plugins.vsphere.tools.CloudProvisioningState;
Expand All @@ -69,6 +69,7 @@
* @author ksmith
*/
public class vSphereCloudSlaveTemplate implements Describable<vSphereCloudSlaveTemplate> {

private static final Logger LOGGER = Logger.getLogger(vSphereCloudSlaveTemplate.class.getName());

protected static final SchemeRequirement HTTP_SCHEME = new SchemeRequirement("http");
Expand Down Expand Up @@ -103,28 +104,28 @@ public class vSphereCloudSlaveTemplate implements Describable<vSphereCloudSlaveT

@DataBoundConstructor
public vSphereCloudSlaveTemplate(final String cloneNamePrefix,
final String masterImageName,
final String snapshotName,
final boolean linkedClone,
final String cluster,
final String resourcePool,
final String datastore,
final String templateDescription,
final int templateInstanceCap,
final int numberOfExecutors,
final String remoteFS,
final String labelString,
final Mode mode,
final boolean forceVMLaunch,
final boolean waitForVMTools,
final int launchDelay,
final int limitedRunCount,
final boolean saveFailure,
final String targetResourcePool,
final String targetHost,
final String credentialsId,
final List<? extends NodeProperty<?>> nodeProperties,
final List<? extends VSphereGuestInfoProperty> guestInfoProperties) {
final String masterImageName,
final String snapshotName,
final boolean linkedClone,
final String cluster,
final String resourcePool,
final String datastore,
final String templateDescription,
final int templateInstanceCap,
final int numberOfExecutors,
final String remoteFS,
final String labelString,
final Mode mode,
final boolean forceVMLaunch,
final boolean waitForVMTools,
final int launchDelay,
final int limitedRunCount,
final boolean saveFailure,
final String targetResourcePool,
final String targetHost,
final String credentialsId,
final List<? extends NodeProperty<?>> nodeProperties,
final List<? extends VSphereGuestInfoProperty> guestInfoProperties) {
this.cloneNamePrefix = cloneNamePrefix;
this.masterImageName = masterImageName;
this.snapshotName = snapshotName;
Expand Down Expand Up @@ -184,7 +185,7 @@ public String getTemplateDescription() {
}

public int getTemplateInstanceCap() {
if(this.templateInstanceCap == Integer.MAX_VALUE) {
if (this.templateInstanceCap == Integer.MAX_VALUE) {
return 0;
}
return this.templateInstanceCap;
Expand Down Expand Up @@ -257,7 +258,7 @@ public vSphereCloud getParent() {
protected Object readResolve() {
this.labelSet = Label.parse(labelString);

if(this.templateInstanceCap == 0) {
if (this.templateInstanceCap == 0) {
this.templateInstanceCap = Integer.MAX_VALUE;
}
return this;
Expand All @@ -270,10 +271,10 @@ public vSphereCloudProvisionedSlave provision(final CloudProvisioningState algor
final boolean POWER_ON = true;
vSphere.cloneVm(cloneName, this.masterImageName, this.linkedClone, this.resourcePool, this.cluster, this.datastore, POWER_ON, logger);
try {
if( this.guestInfoProperties!=null && !this.guestInfoProperties.isEmpty()) {
if (this.guestInfoProperties != null && !this.guestInfoProperties.isEmpty()) {
final Map<String, String> resolvedGuestInfoProperties = calculateGuestInfoProperties(cloneName, listener);
if( !resolvedGuestInfoProperties.isEmpty() ) {
LOGGER.log(Level.FINE, "Provisioning slave {0} with guestinfo properties {1}", new Object[]{ cloneName, resolvedGuestInfoProperties });
if (!resolvedGuestInfoProperties.isEmpty()) {
LOGGER.log(Level.FINE, "Provisioning slave {0} with guestinfo properties {1}", new Object[]{cloneName, resolvedGuestInfoProperties});
vSphere.addGuestInfoVariable(cloneName, resolvedGuestInfoProperties);
}
}
Expand All @@ -282,7 +283,7 @@ public vSphereCloudProvisionedSlave provision(final CloudProvisioningState algor
slave = new vSphereCloudProvisionedSlave(cloneName, this.templateDescription, this.remoteFS, String.valueOf(this.numberOfExecutors), this.mode, this.labelString, configuredLauncher, configuredStrategy, this.nodeProperties, this.parent.getVsDescription(), cloneName, this.forceVMLaunch, this.waitForVMTools, snapshotName, String.valueOf(this.launchDelay), null, String.valueOf(this.limitedRunCount));
} finally {
// if anything went wrong, try to tidy up
if( slave==null ) {
if (slave == null) {
LOGGER.log(Level.FINER, "Creation of slave failed after cloning VM: destroying clone {0}", cloneName);
vSphere.destroyVm(cloneName, false);
}
Expand All @@ -294,16 +295,16 @@ public vSphereCloudProvisionedSlave provision(final CloudProvisioningState algor
private ComputerLauncher determineLauncher(final VSphere vSphere, final String cloneName) throws VSphereException {
LOGGER.log(Level.FINER, "Slave {0} uses SSHLauncher - obtaining IP address...", cloneName);
final String ip = vSphere.getIp(vSphere.getVmByName(cloneName), 1000);
LOGGER.log(Level.FINER, "Slave {0} has IP address {1}", new Object[] { cloneName, ip });
LOGGER.log(Level.FINER, "Slave {0} has IP address {1}", new Object[]{cloneName, ip});
final SSHLauncher launcher = new SSHLauncher(ip, 0, credentialsId, null, null, null, null, this.launchDelay, 3, 60);
return launcher;
}

private RetentionStrategy<?> determineRetention() {
// final CloudSlaveRetentionStrategy strategy = new CloudSlaveRetentionStrategy();
// strategy.TIMEOUT = TimeUnit2.MINUTES.toMillis(1);
final RunOnceCloudRetentionStrategy strategy = new RunOnceCloudRetentionStrategy(2);
return strategy;
final RunOnceCloudRetentionStrategy strategy = new RunOnceCloudRetentionStrategy(2);
return strategy;
}

@SuppressWarnings("unchecked")
Expand All @@ -314,6 +315,7 @@ public Descriptor<vSphereCloudSlaveTemplate> getDescriptor() {

@Extension
public static final class DescriptorImpl extends Descriptor<vSphereCloudSlaveTemplate> {

@Override
public String getDisplayName() {
return null;
Expand All @@ -324,7 +326,7 @@ public FormValidation doCheckTemplateInstanceCap(@QueryParameter String template
}

public ListBoxModel doFillCredentialsIdItems(@AncestorInPath ItemGroup context) {
if(!(context instanceof AccessControlled ? (AccessControlled) context : Jenkins.getInstance()).hasPermission(Computer.CONFIGURE)) {
if (!(context instanceof AccessControlled ? (AccessControlled) context : Jenkins.getInstance()).hasPermission(Computer.CONFIGURE)) {
return new ListBoxModel();
}
final List<StandardUsernameCredentials> credentials = lookupCredentials(StandardUsernameCredentials.class, context, ACL.SYSTEM, HTTP_SCHEME, HTTPS_SCHEME);
Expand All @@ -336,7 +338,7 @@ private Map<String, String> calculateGuestInfoProperties(final String cloneName,
throws IOException, InterruptedException {
final EnvVars knownVariables = calculateVariablesForGuestInfo(cloneName, listener);
final Map<String, String> resolvedGuestInfoProperties = new LinkedHashMap<String, String>();
for( final VSphereGuestInfoProperty property : this.guestInfoProperties ) {
for (final VSphereGuestInfoProperty property : this.guestInfoProperties) {
final String name = property.getName();
final String configuredValue = property.getValue();
final String resolvedValue = Util.replaceMacro(configuredValue, knownVariables);
Expand All @@ -350,6 +352,11 @@ private EnvVars calculateVariablesForGuestInfo(final String cloneName, final Tas
final EnvVars knownVariables = new EnvVars();
// Maintenance note: If you update this method, you must also update the
// UI help page to match.
final String slaveSecret = JnlpSlaveAgentProtocol.SLAVE_SECRET.mac(cloneName);
if (slaveSecret != null) {
addEnvVar(knownVariables, "JNLP_SECRET", slaveSecret);
}

final String jenkinsUrl = Jenkins.getActiveInstance().getRootUrl();
if (jenkinsUrl != null) {
addEnvVar(knownVariables, "JENKINS_URL", jenkinsUrl);
Expand All @@ -371,14 +378,14 @@ private EnvVars calculateVariablesForGuestInfo(final String cloneName, final Tas
}

private static void addEnvVars(final EnvVars vars, final TaskListener listener, final Iterable<? extends NodeProperty> nodeProperties) throws IOException, InterruptedException {
if( nodeProperties!=null ) {
for (final NodeProperty nodeProperty: nodeProperties) {
nodeProperty.buildEnvVars(vars , listener);
if (nodeProperties != null) {
for (final NodeProperty nodeProperty : nodeProperties) {
nodeProperty.buildEnvVars(vars, listener);
}
}
}

private static void addEnvVar(final EnvVars vars, final String name, final Object valueOrNull) {
vars.put(name, valueOrNull==null?"":valueOrNull.toString());
vars.put(name, valueOrNull == null ? "" : valueOrNull.toString());
}
}
1 change: 1 addition & 0 deletions ...n/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-guestInfoProperties.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<li>All variables exposed from "this" node's own properties, e.g. tool locations.</li>
<li>Environment variables available in build steps that are not build-dependent:
<tt>JENKINS_URL</tt>,
<tt>JNLP_SECRET</tt>,
<tt>NODE_NAME</tt>,
<tt>NODE_LABELS</tt>.
</li>
Expand Down