diff --git a/pom.xml b/pom.xml index 28957005..93e64c15 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,7 @@ - + + 4.0.0 + org.jenkins-ci.plugins plugin @@ -9,9 +11,19 @@ vsphere-cloud 2.19-SNAPSHOT hpi + vSphere Plugin Integrates Jenkins with a vSphere server https://wiki.jenkins-ci.org/display/JENKINS/vSphere+Cloud+Plugin + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + jswager @@ -24,14 +36,6 @@ elordahl@vt.edu - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - scm:git:git://github.com/jenkinsci/vsphere-cloud-plugin.git @@ -44,21 +48,6 @@ UTF-8 - - - repo.jenkins-ci.org - Jenkins Repository - http://repo.jenkins-ci.org/public/ - - - - - - repo.jenkins-ci.org - http://repo.jenkins-ci.org/public/ - - - org.kohsuke.stapler @@ -100,6 +89,19 @@ + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + diff --git a/src/main/java/org/jenkinsci/plugins/vSphereCloud.java b/src/main/java/org/jenkinsci/plugins/vSphereCloud.java index ee283c03..757887fb 100644 --- a/src/main/java/org/jenkinsci/plugins/vSphereCloud.java +++ b/src/main/java/org/jenkinsci/plugins/vSphereCloud.java @@ -340,7 +340,7 @@ public Collection provision(final Label label, int excessWorkload) excessWorkloadSoFar -= numberOfvSphereCloudSlaveExecutors; if (excessWorkloadSoFar <= 0) { VSLOG.log(Level.INFO, methodCallDescription + ": " + numberOfvSphereCloudSlaves + " existing slaves (=" - + numberOfvSphereCloudSlaveExecutors + " executors): Workload is satisifed by bringing those online."); + + numberOfvSphereCloudSlaveExecutors + " executors): Workload is satisfied by bringing those online."); return Collections.emptySet(); } // If we've got this far then our static slaves are insufficient to meet diff --git a/src/main/java/org/jenkinsci/plugins/vsphere/RunOnceCloudRetentionStrategy.java b/src/main/java/org/jenkinsci/plugins/vsphere/RunOnceCloudRetentionStrategy.java index a7759b1b..1bdf6789 100644 --- a/src/main/java/org/jenkinsci/plugins/vsphere/RunOnceCloudRetentionStrategy.java +++ b/src/main/java/org/jenkinsci/plugins/vsphere/RunOnceCloudRetentionStrategy.java @@ -25,9 +25,9 @@ import hudson.slaves.CloudRetentionStrategy; import hudson.slaves.EphemeralNode; import hudson.slaves.RetentionStrategy; -import hudson.util.TimeUnit2; import java.io.IOException; +import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; @@ -60,7 +60,7 @@ public int getIdleMinutes() { public long check(final AbstractCloudComputer c) { if (c.isIdle() && !disabled) { final long idleMilliseconds = System.currentTimeMillis() - c.getIdleStartMilliseconds(); - if (idleMilliseconds > TimeUnit2.MINUTES.toMillis(idleMinutes)) { + if (idleMilliseconds > TimeUnit.MINUTES.toMillis(idleMinutes)) { LOGGER.log( Level.FINE, "Disconnecting {0} because it has been idle for more than {1} minutes (has been idle for {2}ms)", diff --git a/src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureDisk.java b/src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureDisk.java index d91de6fb..512ed96a 100644 --- a/src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureDisk.java +++ b/src/main/java/org/jenkinsci/plugins/vsphere/builders/ReconfigureDisk.java @@ -143,7 +143,7 @@ private VirtualDeviceConfigSpec createAddDiskConfigSpec( if (m.matches()) { diskNames.put(m.group(1), true); } else { - VSphereLogger.vsLogger(jLogger, String.format("Warning: unreconnized disk filename format: %s", info.getFileName())); + VSphereLogger.vsLogger(jLogger, String.format("Warning: unrecognized disk filename format: %s", info.getFileName())); } } } diff --git a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-guestInfoProperties.html b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-guestInfoProperties.html index d2aaa84f..f4594d42 100644 --- a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-guestInfoProperties.html +++ b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-guestInfoProperties.html @@ -1,7 +1,7 @@
Uses the vSphere "GuestInfo" data object to pass information to the newly-cloned virtual machine. The guest operating system can retrieve this information using the vmtoolsd utility. -

+
e.g. Passing in a GuestInfo property named "JNLPURL" with value diff --git a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-retentionStrategy.html b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-retentionStrategy.html index 30c2ccce..3de6dc6e 100644 --- a/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-retentionStrategy.html +++ b/src/main/resources/org/jenkinsci/plugins/vSphereCloudSlaveTemplate/help-retentionStrategy.html @@ -4,6 +4,6 @@
  • If you use the run-once strategy, you should ensure that there is only 1 executor.
  • If you use the keep-until-idle strategy, you should ensure that "disconnect after limited builds" is disabled (set to 0).
    • -Both these otions have an idle timeout (in minutes) after which to kill the slave, but for a run-once strategy, this is only a fail-safe if the slave fails to connect. +Both these options have an idle timeout (in minutes) after which to kill the slave, but for a run-once strategy, this is only a fail-safe if the slave fails to connect. Normally a run-once slave will be terminated immediately after it has completed its one-and-only job.
    diff --git a/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereConnectionConfig/config.groovy b/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereConnectionConfig/config.groovy index 8e2138a8..4f5fb13a 100644 --- a/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereConnectionConfig/config.groovy +++ b/src/main/resources/org/jenkinsci/plugins/vsphere/VSphereConnectionConfig/config.groovy @@ -1,4 +1,4 @@ -package org.jenkinsci.plugins.vsphere.VSphereConnectionConfig; +package org.jenkinsci.plugins.vsphere.VSphereConnectionConfig f = namespace(lib.FormTagLib) c = namespace(lib.CredentialsTagLib) diff --git a/src/test/java/org/jenkinsci/plugins/vsphere/tools/CloudProvisioningAlgorithmTest.java b/src/test/java/org/jenkinsci/plugins/vsphere/tools/CloudProvisioningAlgorithmTest.java index 02f2af5b..b48ec3c7 100644 --- a/src/test/java/org/jenkinsci/plugins/vsphere/tools/CloudProvisioningAlgorithmTest.java +++ b/src/test/java/org/jenkinsci/plugins/vsphere/tools/CloudProvisioningAlgorithmTest.java @@ -114,16 +114,16 @@ private void findTemplateWithMostFreeCapacityGivenUnequalCapsThenDistributesTheL } @Test - public void findTemplateWithMostFreeCapacityGivenOneCappedAndOneUncappedThenDistributesTheLoadEventlyUntilCapReached() { - findTemplateWithMostFreeCapacityGivenDifferentCapnessThenDistributesTheLoadEventlyUntilCapReached(true); + public void findTemplateWithMostFreeCapacityGivenOneCappedAndOneUncappedThenDistributesTheLoadEvenlyUntilCapReached() { + findTemplateWithMostFreeCapacityGivenDifferentCapnessThenDistributesTheLoadEvenlyUntilCapReached(true); } @Test - public void findTemplateWithMostFreeCapacityGivenOneUncappedAndOneCappedThenDistributesTheLoadEventlyUntilCapReached() { - findTemplateWithMostFreeCapacityGivenDifferentCapnessThenDistributesTheLoadEventlyUntilCapReached(false); + public void findTemplateWithMostFreeCapacityGivenOneUncappedAndOneCappedThenDistributesTheLoadEvenlyUntilCapReached() { + findTemplateWithMostFreeCapacityGivenDifferentCapnessThenDistributesTheLoadEvenlyUntilCapReached(false); } - private void findTemplateWithMostFreeCapacityGivenDifferentCapnessThenDistributesTheLoadEventlyUntilCapReached( + private void findTemplateWithMostFreeCapacityGivenDifferentCapnessThenDistributesTheLoadEvenlyUntilCapReached( boolean forwards) { // Given final CloudProvisioningRecord capOf2 = createInstance(2, 0, 0);