Merge branch 'jenkinsci:master' into feature/selection-interface-ssh-multiple-network

Author: Bilgetz

.github/workflows/jenkins-security-scan.yml

@@ -0,0 +1,21 @@
+name: Jenkins Security Scan
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+  workflow_dispatch:
+
+permissions:
+  security-events: write
+  contents: read
+  actions: read
+
+jobs:
+  security-scan:
+    uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2
+    with:
+      java-cache: 'maven' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate.
+      # java-version: 21 # Optionally specify what version of Java to set up for the build, or remove to use a recent default.

.gitignore

@@ -12,3 +12,4 @@ release.properties
 **/dependency-reduced-pom.xml
 **/target
 .DS_Store
+tags

Jenkinsfile

@@ -1,4 +1,11 @@
 #!/usr/bin/env groovy
 
 /* `buildPlugin` step provided by: https://github.com/jenkins-infra/pipeline-library */
-buildPlugin()
+buildPlugin(
+  useContainerAgent: true,
+  failFast: false,
+  configurations: [
+    [platform: 'linux', jdk: 11],
+    [platform: 'linux', jdk: 17],
+    [platform: 'windows', jdk: 11],
+])

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015 OpenStack Cloud Plugin
+
+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 OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -38,7 +38,7 @@ in effect is printed under the field on hte config page). In case required
 field do not have a default nor current value, it will be reported.
 
 The exception is here is the *Instance Cap* field that determines the maximal
-ammount of maches to be running either per whole cloud or per template. This is
+amount of machines to be running either per whole cloud or per template. This is
 so one can limit the total number and number per individual template at the same time.
 
 ### User data
@@ -81,6 +81,7 @@ jenkins:
         endPointUrl: "https://acme.com:5000"
         credentialsId: "openstack_service_credentials"
         ignoreSsl: false
+        cleanfreq: 30
         zone: foo
         slaveOptions:
           bootSource:

plugin/pom.xml

@@ -5,45 +5,51 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.289.x</artifactId>
-                <version>950.v396cb834de1e</version>
+                <artifactId>bom-2.414.x</artifactId>
+                <version>2516.v113cb_3d00317</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>5.10.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.25</version>
+        <version>4.55</version>
         <relativePath />
     </parent>
 
     <artifactId>openstack-cloud</artifactId>
-    <version>2.64-SNAPSHOT</version>
+    <version>2.67-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <name>OpenStack Cloud Plugin</name>
     <description>Allows Jenkins to build on OpenStack nodes</description>
     <url>https://github.com/jenkinsci/openstack-cloud-plugin</url>
 
     <properties>
-        <jenkins.version>2.289.1</jenkins.version>
-        <java.level>8</java.level>
+        <jenkins.version>2.419</jenkins.version>
+        <java.level>11</java.level>
         <concurrency>1C</concurrency>
         <surefire.useFile>false</surefire.useFile>
         <spotbugs.failOnError>false</spotbugs.failOnError>
         <spotbugs.excludeFilterFile>src/findbugs-exclude.xml</spotbugs.excludeFilterFile>
-        <spotbugs.skip>true
-        </spotbugs.skip> <!-- Upstream Jenkins fails the build if some are found. Excludes does not seem to work. -->
+        <spotbugs.skip>true</spotbugs.skip> <!-- Upstream Jenkins fails the build if some are found. Excludes do not seem to work. -->
         <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
 
-        <guava.version>20.0</guava.version> <!-- version compatible with openstack4j -->
+        <guava.version>32.1.1-jre</guava.version> <!-- version compatible with openstack4j -->
         <jsr305.version>1.3.9</jsr305.version>
-        <openstack4j.version>3.10</openstack4j.version>
+        <openstack4j.version>3.11</openstack4j.version>
         <okhttp.version>3.9.1</okhttp.version>
-        <jenkins-test-harness.version>1626.v46b0925e70db</jenkins-test-harness.version>
-        <jackson.version>2.12.4</jackson.version>
+        <!-- Upper bound io.jenkins.configuration-as-code:test-harness -->
+        <jenkins-test-harness.version>2064.vcd3b_b_8f3f2b_a_</jenkins-test-harness.version>
     </properties>
 
     <developers>
@@ -94,16 +100,17 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
+            <version>1305.v04f5ec1f3743</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>config-file-provider</artifactId>
-            <version>3.5</version>
+            <version>3.7.1</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>cloud-stats</artifactId>
-            <version>0.21</version>
+            <version>336.v788e4055508b_</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -117,7 +124,6 @@
         <dependency>
             <groupId>org.jenkins-ci.modules</groupId>
             <artifactId>instance-identity</artifactId>
-            <version>2.2</version>
         </dependency>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
@@ -136,58 +142,43 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>3.0.10</version>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-classworlds</artifactId>
             <version>2.4.2</version>
         </dependency>
+
         <dependency>
             <groupId>org.jenkins-ci</groupId>
             <artifactId>symbol-annotation</artifactId>
         </dependency>
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>1.29</version>
-        </dependency>
-
-        <!--Specifying jenkins version to avoid maven.plugins.enforcer.RequireUpperBoundDeps error
-        between configuration as code and openstack4j -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.2</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>jackson2-api</artifactId>
+            <version>2.14.1-313.v504cdd45c18b</version>
         </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
+            <version>2.2</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
             <version>1.9.5</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-cps</artifactId>
@@ -231,7 +222,29 @@
             <artifactId>test-harness</artifactId>
             <groupId>io.jenkins.configuration-as-code</groupId>
             <scope>test</scope>
-        </dependency>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jenkins-ci.plugins</groupId>
+                    <artifactId>jackson2-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>net.sourceforge.htmlunit</groupId>-->
+<!--            <artifactId>htmlunit</artifactId>-->
+<!--            <version>2.70.0</version>-->
+<!--            <scope>test</scope>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.apache.commons</groupId>-->
+<!--                    <artifactId>commons-lang3</artifactId>-->
+<!--                </exclusion>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.eclipse.jetty.websocket</groupId>-->
+<!--                    <artifactId>websocket-client</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>
@@ -255,6 +268,8 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
                         <reuseForks>false</reuseForks>
+                        <!-- Serializing org.mockito.internal.stubbing.StubbedInvocationMatcher#answers -->
+                        <argLine>${argLine} --add-opens java.base/java.util.concurrent=ALL-UNNAMED</argLine>
                     </configuration>
                 </plugin>
             </plugins>
@@ -264,9 +279,9 @@
 
     <scm>
         <connection>scm:git:ssh://github.com/jenkinsci/openstack-cloud-plugin.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/jenkinsci/openstack-cloud-plugin.git</developerConnection>
+        <developerConnection>scm:git:git@github.com:jenkinsci/openstack-cloud-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/openstack-cloud-plugin</url>
-        <tag>HEAD</tag>
+        <tag>parent-2.66</tag>
     </scm>
 
     <repositories>

plugin/src/main/java/jenkins/plugins/openstack/compute/JCloudsCleanupThread.java

@@ -48,11 +48,15 @@ public JCloudsCleanupThread() {
 
     @Override
     public long getRecurrencePeriod() {
-        return MIN * 10;
+        // fixed value: 1000 millis
+        long cleanFreq = 1000;
+
+        return cleanFreq;
     }
 
     @Override
     public void execute(TaskListener listener) {
+
         try {
             terminateNodesPendingDeletion();
 
@@ -61,6 +65,9 @@ public void execute(TaskListener listener) {
             terminatesNodesWithoutServers(runningServers);
 
             cleanOrphanedFips();
+
+            setCloudLastCleanTime();
+
         } catch (JCloudsCloud.LoginFailure ex) {
             LOGGER.log(Level.WARNING, "Unable to authenticate: " + ex.getMessage());
         } catch (Throwable ex) {
@@ -70,6 +77,7 @@ public void execute(TaskListener listener) {
 
     private void cleanOrphanedFips() {
         for (JCloudsCloud cloud : JCloudsCloud.getClouds()) {
+            if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
             Openstack openstack = cloud.getOpenstack();
 
             List<String> leaked = openstack.getFreeFipIds();
@@ -87,11 +95,20 @@ private void cleanOrphanedFips() {
         }
     }
 
+    private void setCloudLastCleanTime() {
+            for (JCloudsCloud cloud : JCloudsCloud.getClouds()) {
+                if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
+                cloud.setLastCleanTime(System.currentTimeMillis());
+            }
+    }
+
     private void terminateNodesPendingDeletion() {
         for (final JCloudsComputer comp : JCloudsComputer.getAll()) {
+            JCloudsCloud cloud = JCloudsCloud.getByName(comp.getId().getCloudName());
+            if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
             if (!comp.isIdle()) continue;
 
-            final OfflineCause offlineCause = comp.getFatalOfflineCause();
+            final OfflineCause offlineCause = comp.getNode().getFatalOfflineCause();
             if (comp.isPendingDelete()) {
                 LOGGER.log(Level.INFO, "Deleting pending node " + comp.getName() + ". Reason: " + comp.getOfflineCause());
                 deleteComputer(comp);
@@ -156,6 +173,7 @@ private void deleteComputer(JCloudsComputer comp, CauseOfInterruption coi) {
     private @Nonnull HashMap<JCloudsCloud, List<Server>> destroyServersOutOfScope() {
         HashMap<JCloudsCloud, List<Server>> runningServers = new HashMap<>();
         for (JCloudsCloud jc : JCloudsCloud.getClouds()) {
+            if ((System.currentTimeMillis() - jc.getLastCleanTime()) < jc.getCleanfreqToMillis()) continue;
             runningServers.put(jc, new ArrayList<>());
             List<Server> servers = jc.getOpenstack().getRunningNodes();
             for (Server server : servers) {
@@ -175,6 +193,9 @@ private void deleteComputer(JCloudsComputer comp, CauseOfInterruption coi) {
     private void terminatesNodesWithoutServers(@Nonnull HashMap<JCloudsCloud, List<Server>> runningServers) {
         Map<String, JCloudsComputer> jenkinsComputers = new HashMap<>();
         for (JCloudsComputer computer: JCloudsComputer.getAll()) {
+            JCloudsCloud cloud = JCloudsCloud.getByName(computer.getId().getCloudName());
+            if ((System.currentTimeMillis() - cloud.getLastCleanTime()) < cloud.getCleanfreqToMillis()) continue;
+
             JCloudsSlave node = computer.getNode();
             if (node != null) {
                 jenkinsComputers.put(node.getServerId(), computer);