Merge branch 'master' into remove_use_beta

Author: strangelookingnerd

demos/ec2/README.md

@@ -44,11 +44,11 @@ jenkins:
         region: "eu-central-1"
         templates:
           - description: "Auto configured EC2 Agent Small"
-            type: "T2Small"
+            type: "t2.small"
             labelString: "Small"
             <<: *ec2_anchor
           - description: "Auto configured EC2 Agent Large"
-            type: "T2Xlarge"
+            type: "t2.xlarge"
             labelString: "Large"
             <<: *ec2_anchor
 ```

demos/mesos/README.md

@@ -13,7 +13,7 @@
   <properties>
     <!-- no need to be deployed during release, this is a test-only module -->
     <maven.deploy.skip>true</maven.deploy.skip>
-    <jenkins.version>2.492.1</jenkins.version>
+    <jenkins.version>2.504.1</jenkins.version>
   </properties>
 
   <dependencyManagement>
@@ -61,7 +61,6 @@
     <dependency>
       <groupId>io.jenkins.docker</groupId>
       <artifactId>docker-plugin</artifactId>
-      <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -128,7 +127,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>azure-keyvault</artifactId>
-      <version>280.v166053ddda_42</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -210,7 +208,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>jira</artifactId>
-      <version>3.13</version>
+      <version>3.15</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -238,12 +236,6 @@
       <artifactId>mercurial</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>mesos</artifactId>
-      <version>1.0.0</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>metrics</artifactId>
@@ -283,7 +275,6 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>simple-theme-plugin</artifactId>
-      <version>202.v6367d3dea_73b_</version>
       <scope>test</scope>
     </dependency>
     <dependency>

integrations/pom.xml

@@ -10,7 +10,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.amazonaws.services.ec2.model.InstanceType;
 import hudson.model.labels.LabelAtom;
 import hudson.plugins.ec2.AMITypeData;
 import hudson.plugins.ec2.EC2Cloud;
@@ -22,6 +21,7 @@
 import jenkins.model.Jenkins;
 import org.junit.Rule;
 import org.junit.Test;
+import software.amazon.awssdk.services.ec2.model.InstanceType;
 
 public class EC2CloudTest {
 
@@ -48,7 +48,7 @@ public void configure_ec2_cloud() {
         assertFalse(slaveTemplate.monitoring);
         assertFalse(slaveTemplate.stopOnTerminate);
         assertFalse(slaveTemplate.useEphemeralDevices);
-        assertThat(slaveTemplate.type, is(InstanceType.T2Small));
+        assertThat(slaveTemplate.type, is(InstanceType.T2_SMALL.toString()));
         assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3"));
         assertThat(slaveTemplate.getLabelString(), containsString("Small"));
         assertThat(slaveTemplate.getLabelSet(), is(notNullValue()));
@@ -78,7 +78,7 @@ public void configure_ec2_cloud() {
         assertFalse(slaveTemplate.monitoring);
         assertFalse(slaveTemplate.stopOnTerminate);
         assertFalse(slaveTemplate.useEphemeralDevices);
-        assertThat(slaveTemplate.type, is(InstanceType.T2Xlarge));
+        assertThat(slaveTemplate.type, is(InstanceType.T2_XLARGE.toString()));
         assertThat(slaveTemplate.getAmi(), equalTo("ami-0c6bb742864ffa3f3"));
         assertThat(slaveTemplate.getLabelString(), containsString("Large"));
         assertThat(slaveTemplate.getLabelSet(), is(notNullValue()));

integrations/src/test/java/io/jenkins/plugins/casc/EC2CloudTest.java

@@ -7,15 +7,19 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import hudson.node_monitors.DiskSpaceMonitorNodeProperty;
 import hudson.slaves.EnvironmentVariablesNodeProperty;
 import hudson.slaves.NodeProperty;
 import hudson.slaves.NodePropertyDescriptor;
+import hudson.tools.ToolLocationNodeProperty;
 import hudson.util.DescribableList;
 import io.jenkins.plugins.casc.misc.ConfiguredWithCode;
 import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
 import io.jenkins.plugins.casc.misc.junit.jupiter.WithJenkinsConfiguredWithCode;
 import io.jenkins.plugins.casc.model.CNode;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import jenkins.model.Jenkins;
 import org.junit.jupiter.api.Test;
@@ -30,14 +34,33 @@ void configure(JenkinsConfiguredWithCodeRule j) {
 
         DescribableList<NodeProperty<?>, NodePropertyDescriptor> nodeProperties = jenkins.getGlobalNodeProperties();
 
-        Set<Map.Entry<String, String>> entries = ((EnvironmentVariablesNodeProperty) nodeProperties.get(0))
+        assertEquals(3, nodeProperties.size());
+
+        Set<Map.Entry<String, String>> envVars = ((EnvironmentVariablesNodeProperty)
+                        nodeProperties.get(EnvironmentVariablesNodeProperty.class))
                 .getEnvVars()
                 .entrySet();
-        assertEquals(1, entries.size());
+        assertEquals(2, envVars.size());
 
-        Map.Entry<String, String> envVar = entries.iterator().next();
+        Iterator<Entry<String, String>> iterator = envVars.iterator();
+        Map.Entry<String, String> envVar = iterator.next();
         assertEquals("FOO", envVar.getKey());
         assertEquals("BAR", envVar.getValue());
+
+        envVar = iterator.next();
+        assertEquals("FOO2", envVar.getKey());
+        assertEquals("", envVar.getValue());
+
+        DiskSpaceMonitorNodeProperty diskSpace = nodeProperties.get(DiskSpaceMonitorNodeProperty.class);
+        assertEquals("1GiB", diskSpace.getFreeDiskSpaceThreshold());
+        assertEquals("2GiB", diskSpace.getFreeDiskSpaceWarningThreshold());
+        assertEquals("1GiB", diskSpace.getFreeTempSpaceThreshold());
+        assertEquals("2GiB", diskSpace.getFreeTempSpaceWarningThreshold());
+
+        ToolLocationNodeProperty toolLocations = nodeProperties.get(ToolLocationNodeProperty.class);
+        assertEquals(1, toolLocations.getLocations().size());
+        assertEquals("Default", toolLocations.getLocations().get(0).getName());
+        assertEquals("/home/user/bin/git", toolLocations.getLocations().get(0).getHome());
     }
 
     @Test

integrations/src/test/java/io/jenkins/plugins/casc/GlobalNodePropertiesTest.java

@@ -0,0 +1,64 @@
+package io.jenkins.plugins.casc;
+
+import static io.jenkins.plugins.casc.misc.Util.getJenkinsRoot;
+import static io.jenkins.plugins.casc.misc.Util.toStringFromYamlFile;
+import static io.jenkins.plugins.casc.misc.Util.toYamlString;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+
+import hudson.slaves.EnvironmentVariablesNodeProperty;
+import hudson.slaves.NodeProperty;
+import hudson.slaves.NodePropertyDescriptor;
+import hudson.tools.ToolLocationNodeProperty;
+import hudson.util.DescribableList;
+import io.jenkins.plugins.casc.misc.ConfiguredWithCode;
+import io.jenkins.plugins.casc.misc.Env;
+import io.jenkins.plugins.casc.misc.EnvVarsRule;
+import io.jenkins.plugins.casc.misc.Envs;
+import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
+import io.jenkins.plugins.casc.model.CNode;
+import java.util.Map;
+import org.hamcrest.core.Is;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+
+public class GlobalNodePropertiesWithEnvVarsTest {
+
+    private JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule();
+
+    @Rule
+    public RuleChain chain = RuleChain.outerRule(new EnvVarsRule()).around(j);
+
+    @Test
+    @ConfiguredWithCode("GlobalNodePropertiesWithEnvVarsTest.yml")
+    @Envs({@Env(name = "VALUE_1", value = "BAR"), @Env(name = "TEST_GIT_HOME", value = "git-home")})
+    public void configureWithEnvVarsTest() {
+        DescribableList<NodeProperty<?>, NodePropertyDescriptor> nodeProperties = j.jenkins.getGlobalNodeProperties();
+        Map<String, String> envVars = ((EnvironmentVariablesNodeProperty)
+                        nodeProperties.get(EnvironmentVariablesNodeProperty.class))
+                .getEnvVars();
+
+        assertThat(envVars.size(), is(2));
+        assertThat(envVars.get("FOO"), is("BAR"));
+        assertThat(envVars.get("FOO2"), is(""));
+
+        ToolLocationNodeProperty toolLocations = nodeProperties.get(ToolLocationNodeProperty.class);
+        assertThat(toolLocations.getLocations(), hasSize(1));
+        assertThat(toolLocations.getLocations().get(0).getHome(), is("git-home"));
+    }
+
+    @Test
+    @ConfiguredWithCode("GlobalNodePropertiesWithEnvVarsTest.yml")
+    @Envs({@Env(name = "VALUE_1", value = "BAR"), @Env(name = "TEST_GIT_HOME", value = "git-home")})
+    public void export() throws Exception {
+        ConfiguratorRegistry registry = ConfiguratorRegistry.get();
+        ConfigurationContext context = new ConfigurationContext(registry);
+        CNode yourAttribute = getJenkinsRoot(context).get("globalNodeProperties");
+
+        String exported = toYamlString(yourAttribute);
+        String expected = toStringFromYamlFile(this, "GlobalNodePropertiesWithEnvVarsTestExpected.yml");
+        assertThat(exported, Is.is(expected));
+    }
+}

integrations/src/test/java/io/jenkins/plugins/casc/GlobalNodePropertiesWithEnvVarsTest.java

@@ -1,6 +1,17 @@
 jenkins:
   globalNodeProperties:
+    - diskSpaceMonitor:
+        freeDiskSpaceThreshold: "1GiB"
+        freeDiskSpaceWarningThreshold: "2GiB"
+        freeTempSpaceThreshold: "1GiB"
+        freeTempSpaceWarningThreshold: "2GiB"
     - envVars:
         env:
           - key: FOO
             value: BAR
+          - key: FOO2
+            value: ""
+    - toolLocation:
+        locations:
+          - home: "/home/user/bin/git"
+            key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"

integrations/src/test/java/io/jenkins/plugins/casc/MesosTest.java

@@ -1,4 +1,15 @@
+- diskSpaceMonitor:
+    freeDiskSpaceThreshold: "1GiB"
+    freeDiskSpaceWarningThreshold: "2GiB"
+    freeTempSpaceThreshold: "1GiB"
+    freeTempSpaceWarningThreshold: "2GiB"
 - envVars:
     env:
     - key: "FOO"
       value: "BAR"
+    - key: "FOO2"
+      value: ""
+- toolLocation:
+    locations:
+    - home: "/home/user/bin/git"
+      key: "hudson.plugins.git.GitTool$DescriptorImpl@Default"