Merge pull request #2848 from jglick/ltsc2022

Update Windows tests from LTSC 2019 to LTSC 2022

Author: jglick

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecorator.java

@@ -623,8 +623,8 @@ public void onClose(int i, String s) {
                     if (!launcher.isUnix() && toggleOutputForCaller != null) {
                         // Windows welcome message should not be sent to the caller as it is a side-effect of calling
                         // the wrapping cmd.exe
-                        // Microsoft Windows [Version 10.0.17763.2686]
-                        // (c) 2018 Microsoft Corporation. All rights reserved.
+                        // Microsoft Windows [Version 10.0.20348.4893]
+                        // (c) Microsoft Corporation. All rights reserved.
                         //
                         // C:\>
                         stream.flush();

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud/help-directConnection.html

@@ -12,7 +12,7 @@
 
   <p>
     <b>Note:</b> In <i>Direct Connection</i> mode agents will not be able to reconnect to a restarted controller if a <i>Random</i> 'TCP port for inbound agents' is configured!<br/>
-    <b>Note:</b> <i>Direct Connection</i> does not work with the currently available <code>jenkins/inbound-agent:windowsservercore-1809</code> image.
+    <b>Note:</b> <i>Direct Connection</i> does not work with the currently available <code>jenkins/inbound-agent:windowsservercore-ltsc2022</code> image.
   </p>
 
 </div>

src/main/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/samples/windows.groovy

@@ -8,16 +8,17 @@ kind: Pod
 spec:
   containers:
   - name: jnlp
-    image: jenkins/inbound-agent:windowsservercore-1809
+    image: jenkins/inbound-agent:windowsservercore-ltsc2022
   - name: shell
-    image: mcr.microsoft.com/powershell:preview-windowsservercore-1809
+    image: mcr.microsoft.com/powershell:preview-windowsservercore-ltsc2022
     command:
     - powershell
     args:
     - Start-Sleep
     - 999999
   nodeSelector:
     kubernetes.io/os: windows
+    node.kubernetes.io/windows-build: 10.0.20348
 ''') {
     retry(count: 2, conditions: [kubernetesAgent(), nonresumable()]) {
         node(POD_LABEL) {

src/test/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesTestUtil.java

@@ -30,7 +30,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
-import edu.umd.cs.findbugs.annotations.CheckForNull;
 import hudson.Util;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.Node;
@@ -77,7 +76,7 @@ public class KubernetesTestUtil {
     public static final String CONTAINER_ENV_VAR_FROM_SECRET_VALUE = "container-pa55w0rd";
     public static final String POD_ENV_VAR_FROM_SECRET_VALUE = "pod-pa55w0rd";
 
-    public static final String WINDOWS_1809_BUILD = "10.0.17763";
+    public static final String WINDOWS_LTSC_2022_BUILD = "10.0.20348";
 
     public static KubernetesCloud setupCloud(Object test, String name) throws Exception {
         KubernetesCloud cloud = new KubernetesCloud("kubernetes");
@@ -155,18 +154,16 @@ public static void assumeWindows(String buildNumber) {
         assumeTrue(isWindows(buildNumber), "Cluster seems to contain no Windows nodes with build " + buildNumber);
     }
 
-    public static boolean isWindows(@CheckForNull String buildNumber) {
+    public static boolean isWindows(String buildNumber) {
         try (KubernetesClient client = new KubernetesClientBuilder().build()) {
             for (Node n : client.nodes().list().getItems()) {
                 Map<String, String> labels = n.getMetadata().getLabels();
                 String os = labels.get("kubernetes.io/os");
                 String windowsBuild = labels.get("node.kubernetes.io/windows-build");
                 LOGGER.info(() -> "Found node " + n.getMetadata().getName() + " running OS " + os
                         + " with Windows build " + windowsBuild);
-                if ("windows".equals(os)) {
-                    if (buildNumber == null || buildNumber.equals(windowsBuild)) {
-                        return true;
-                    }
+                if ("windows".equals(os) && buildNumber.equals(windowsBuild)) {
+                    return true;
                 }
             }
         }

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/ContainerExecDecoratorWindowsTest.java

@@ -24,7 +24,7 @@
 
 package org.csanchez.jenkins.plugins.kubernetes.pipeline;
 
-import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.WINDOWS_1809_BUILD;
+import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.WINDOWS_LTSC_2022_BUILD;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.assumeKubernetes;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.assumeWindows;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.deletePods;
@@ -95,7 +95,7 @@ class ContainerExecDecoratorWindowsTest {
     @BeforeAll
     static void beforeAll() {
         assumeKubernetes();
-        assumeWindows(WINDOWS_1809_BUILD);
+        assumeWindows(WINDOWS_LTSC_2022_BUILD);
     }
 
     @BeforeEach
@@ -106,7 +106,7 @@ void beforeEach(JenkinsRule rule, TestInfo info) throws Exception {
         client = cloud.connect();
         deletePods(client, getLabels(this, name), false);
 
-        String image = "mcr.microsoft.com/windows:" + WINDOWS_1809_BUILD + ".2686";
+        String image = "mcr.microsoft.com/powershell:preview-windowsservercore-ltsc2022";
         String containerName = "container";
         String podName = "test-command-execution-" + RandomStringUtils.random(5, "bcdfghjklmnpqrstvwxz0123456789");
         pod = client.pods()
@@ -123,7 +123,7 @@ void beforeEach(JenkinsRule rule, TestInfo info) throws Exception {
                                 .withArgs("Start-Sleep", "2147483")
                                 .build())
                         .addToNodeSelector("kubernetes.io/os", "windows")
-                        .addToNodeSelector("node.kubernetes.io/windows-build", WINDOWS_1809_BUILD)
+                        .addToNodeSelector("node.kubernetes.io/windows-build", WINDOWS_LTSC_2022_BUILD)
                         .withTerminationGracePeriodSeconds(0L)
                         .endSpec()
                         .build());

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesPipelineTest.java

@@ -28,7 +28,7 @@
 import static org.awaitility.Awaitility.await;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.CONTAINER_ENV_VAR_FROM_SECRET_VALUE;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.POD_ENV_VAR_FROM_SECRET_VALUE;
-import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.WINDOWS_1809_BUILD;
+import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.WINDOWS_LTSC_2022_BUILD;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.assumeWindows;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.deletePods;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.getLabels;
@@ -99,6 +99,7 @@
 import org.jvnet.hudson.test.LogRecorder;
 import org.jvnet.hudson.test.MockAuthorizationStrategy;
 import org.jvnet.hudson.test.TestExtension;
+import org.jvnet.hudson.test.recipes.WithTimeout;
 
 class KubernetesPipelineTest extends AbstractKubernetesPipelineTest {
 
@@ -715,8 +716,9 @@ void runInDynamicallyCreatedContainer() throws Exception {
 
     @Issue("JENKINS-57256")
     @Test
+    @WithTimeout(value = 900) // in case we need to pull windows docker image
     void basicWindows() throws Exception {
-        assumeWindows(WINDOWS_1809_BUILD);
+        assumeWindows(WINDOWS_LTSC_2022_BUILD);
         cloud.setDirectConnection(false); // not yet supported by
         // https://github.com/jenkinsci/docker-inbound-agent/blob/517ccd68fd1ce420e7526ca6a40320c9a47a2c18/jenkins-agent.ps1
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
@@ -726,8 +728,9 @@ void basicWindows() throws Exception {
 
     @Issue("JENKINS-53500")
     @Test
+    @WithTimeout(value = 900) // in case we need to pull windows docker image
     void windowsContainer() throws Exception {
-        assumeWindows(WINDOWS_1809_BUILD);
+        assumeWindows(WINDOWS_LTSC_2022_BUILD);
         cloud.setDirectConnection(false);
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
         r.assertLogContains("Directory of C:\\home\\jenkins\\agent\\workspace\\windows Container\\subdir", b);
@@ -739,7 +742,7 @@ void windowsContainer() throws Exception {
             "Does not appear fixable: https://github.com/jenkinsci/kubernetes-plugin/pull/1724#discussion_r2287512410")
     @Test
     void interruptedPodWindows() throws Exception {
-        assumeWindows(WINDOWS_1809_BUILD);
+        assumeWindows(WINDOWS_LTSC_2022_BUILD);
         cloud.setDirectConnection(false);
         r.waitForMessage("starting to sleep", b);
         b.getExecutor().interrupt();
@@ -749,20 +752,22 @@ void interruptedPodWindows() throws Exception {
 
     @Test
     @Issue("JENKINS-75563")
+    @WithTimeout(value = 900) // in case we need to pull windows docker image
     // Before PR#1724 this would fail as windows processes were not killed
     // and hence files blocked. The test is a bit unrealistic as I want it
     // to be fast and deterministic, but imagine that instead of the ping we execute
     // a big checkout that locks some files and prevents next steps to execute
     void killsProcessesWindows() throws Exception {
-        assumeWindows(WINDOWS_1809_BUILD);
+        assumeWindows(WINDOWS_LTSC_2022_BUILD);
         cloud.setDirectConnection(false);
         r.assertBuildStatus(Result.ABORTED, r.waitForCompletion(b));
         r.assertLogContains("\"It worked!\"", b);
     }
 
     @Test
+    @WithTimeout(value = 900) // in case we need to pull windows docker image
     void secretMaskingWindows() throws Exception {
-        assumeWindows(WINDOWS_1809_BUILD);
+        assumeWindows(WINDOWS_LTSC_2022_BUILD);
         cloud.setDirectConnection(false);
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
         r.assertLogContains(

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/KubernetesSamplesTest.java

@@ -40,7 +40,7 @@ void smokes() throws Exception {
         // TODO tried without success to use Parameterized here (need to construct parameters _after_ JenkinsRule
         // starts)
         for (GroovySample gs : ExtensionList.lookup(GroovySample.class)) {
-            if (gs.name().equals("kubernetes-windows") && !isWindows(null)) {
+            if (gs.name().equals("kubernetes-windows") && !isWindows(WINDOWS_LTSC_2022_BUILD)) {
                 System.err.println("==== Skipping " + gs.title() + " ====");
                 continue;
             }

src/test/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/RestartPipelineTest.java

@@ -64,6 +64,7 @@
 import org.jvnet.hudson.test.LogRecorder;
 import org.jvnet.hudson.test.junit.jupiter.BuildWatcherExtension;
 import org.jvnet.hudson.test.junit.jupiter.JenkinsSessionExtension;
+import org.jvnet.hudson.test.recipes.WithTimeout;
 
 class RestartPipelineTest {
 
@@ -216,8 +217,9 @@ void runInPodWithRestartWithLongSleep() throws Throwable {
     }
 
     @Test
+    @WithTimeout(value = 900) // in case we need to pull windows docker image
     void windowsRestart() throws Throwable {
-        assumeWindows(WINDOWS_1809_BUILD);
+        assumeWindows(WINDOWS_LTSC_2022_BUILD);
         AtomicReference<String> projectName = new AtomicReference<>();
         story.then(r -> {
             configureAgentListener();

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/basicWindows.groovy

@@ -4,10 +4,10 @@ kind: Pod
 spec:
   containers:
   - name: jnlp
-    image: jenkins/inbound-agent:windowsservercore-1809
+    image: jenkins/inbound-agent:windowsservercore-ltsc2022
   nodeSelector:
     kubernetes.io/os: windows
-    node.kubernetes.io/windows-build: 10.0.17763
+    node.kubernetes.io/windows-build: 10.0.20348
 '''
 ) {
     node(POD_LABEL) {

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/pipeline/interruptedPodWindows.groovy

@@ -4,17 +4,17 @@ kind: Pod
 spec:
   containers:
   - name: jnlp
-    image: jenkins/inbound-agent:windowsservercore-1809
+    image: jenkins/inbound-agent:windowsservercore-ltsc2022
   - name: shell
-    image: mcr.microsoft.com/powershell:preview-windowsservercore-1809
+    image: mcr.microsoft.com/powershell:preview-windowsservercore-ltsc2022
     command:
     - powershell
     args:
     - Start-Sleep
     - 999999
   nodeSelector:
     kubernetes.io/os: windows
-    node.kubernetes.io/windows-build: 10.0.17763
+    node.kubernetes.io/windows-build: 10.0.20348
 ''') {
     node(POD_LABEL) {
         container('shell') {