Make assumeWindows/isWindows build specific

Author: Vlatombe

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

@@ -26,6 +26,7 @@
 import static java.util.logging.Level.*;
 import static org.junit.Assume.*;
 
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -81,6 +82,8 @@ 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 KubernetesCloud setupCloud(Object test, TestName name) throws KubernetesAuthException, IOException {
         KubernetesCloud cloud = new KubernetesCloud("kubernetes");
         // unique labels per test
@@ -150,17 +153,21 @@ public static void assumeKubernetes() throws Exception {
      * This means that we can run tests involving Windows agent pods.
      * Note that running the <em>controller</em> on Windows is untested.
      */
-    public static void assumeWindows() {
-        assumeTrue("Cluster seems to contain no Windows nodes", isWindows());
+    public static void assumeWindows(String buildNumber) {
+        assumeTrue("Cluster seems to contain no Windows nodes with build " + buildNumber, isWindows(buildNumber));
     }
 
-    public static boolean isWindows() {
+    public static boolean isWindows(@CheckForNull String buildNumber) {
         try (KubernetesClient client = new DefaultKubernetesClient(new ConfigBuilder(Config.autoConfigure(null)).build())) {
             for (Node n : client.nodes().list().getItems()) {
-                String os = n.getMetadata().getLabels().get("kubernetes.io/os");
-                LOGGER.info(() -> "Found node " + n.getMetadata().getName() + " running OS " + os);
+                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)) {
-                    return true;
+                    if (buildNumber == null || buildNumber.equals(windowsBuild)) {
+                        return true;
+                    }
                 }
             }
         }

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

@@ -37,7 +37,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -79,6 +78,7 @@
  * @author Carlos Sanchez
  */
 public class ContainerExecDecoratorWindowsTest {
+    public static final String WINDOWS_BUILD = "10.0.17763";
     @Rule
     public ExpectedException exception = ExpectedException.none();
 
@@ -104,7 +104,7 @@ public class ContainerExecDecoratorWindowsTest {
     @BeforeClass
     public static void setUpClass() throws Exception {
         assumeKubernetes();
-        assumeWindows();
+        assumeWindows(WINDOWS_BUILD);
     }
 
     @Before
@@ -113,7 +113,7 @@ public void configureCloud() throws Exception {
         client = cloud.connect();
         deletePods(client, getLabels(this, name), false);
 
-        String image = "mcr.microsoft.com/windows:10.0.17763.2686";
+        String image = "mcr.microsoft.com/windows:" + WINDOWS_BUILD + ".2686";
         String containerName = "container";
         String podName = "test-command-execution-" + RandomStringUtils.random(5, "bcdfghjklmnpqrstvwxz0123456789");
         pod = client.pods().create(new PodBuilder()
@@ -129,7 +129,7 @@ public void configureCloud() throws Exception {
                                 .withArgs("Start-Sleep", "2147483")
                             .build())
                     .addToNodeSelector("kubernetes.io/os", "windows")
-                    .addToNodeSelector("node.kubernetes.io/windows-build", "10.0.17763")
+                    .addToNodeSelector("node.kubernetes.io/windows-build", WINDOWS_BUILD)
                     .withTerminationGracePeriodSeconds(0L)
                 .endSpec().build());
 

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

@@ -26,6 +26,7 @@
 
 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.assumeWindows;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.deletePods;
 import static org.csanchez.jenkins.plugins.kubernetes.KubernetesTestUtil.getLabels;
@@ -632,7 +633,7 @@ public void runInDynamicallyCreatedContainer() throws Exception {
     @Issue("JENKINS-57256")
     @Test
     public void basicWindows() throws Exception {
-        assumeWindows();
+        assumeWindows(WINDOWS_1809_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));
         r.assertLogContains("Directory of C:\\home\\jenkins\\agent\\workspace\\basic Windows", b); // bat
@@ -642,7 +643,7 @@ public void basicWindows() throws Exception {
     @Issue("JENKINS-53500")
     @Test
     public void windowsContainer() throws Exception {
-        assumeWindows();
+        assumeWindows(WINDOWS_1809_BUILD);
         cloud.setDirectConnection(false);
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
         r.assertLogContains("Directory of C:\\home\\jenkins\\agent\\workspace\\windows Container\\subdir", b);
@@ -653,7 +654,7 @@ public void windowsContainer() throws Exception {
     @Ignore("TODO aborts, but with “kill finished with exit code 9009” and “After 20s process did not stop” and no graceful shutdown")
     @Test
     public void interruptedPodWindows() throws Exception {
-        assumeWindows();
+        assumeWindows(WINDOWS_1809_BUILD);
         cloud.setDirectConnection(false);
         r.waitForMessage("starting to sleep", b);
         b.getExecutor().interrupt();
@@ -663,7 +664,7 @@ public void interruptedPodWindows() throws Exception {
 
     @Test
     public void secretMaskingWindows() throws Exception {
-        assumeWindows();
+        assumeWindows(WINDOWS_1809_BUILD);
         cloud.setDirectConnection(false);
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
         r.assertLogContains("INSIDE_POD_ENV_VAR_FROM_SECRET = **** or " + POD_ENV_VAR_FROM_SECRET_VALUE.toUpperCase(Locale.ROOT), b);

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

@@ -41,7 +41,7 @@ public class KubernetesSamplesTest extends AbstractKubernetesPipelineTest {
 
     @Test public void smokes() throws Exception {
         for (GroovySample gs : ExtensionList.lookup(GroovySample.class)) {
-            if (gs.name().equals("kubernetes-windows") && !isWindows()) {
+            if (gs.name().equals("kubernetes-windows") && !isWindows(null)) {
                 System.err.println("==== Skipping " + gs.title() + " ====");
                 continue;
             }

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

@@ -217,7 +217,7 @@ public void runInPodWithRestartWithLongSleep() throws Exception {
 
     @Test
     public void windowsRestart() throws Exception {
-        assumeWindows();
+        assumeWindows(WINDOWS_1809_BUILD);
         AtomicReference<String> projectName = new AtomicReference<>();
         story.then(r -> {
             configureAgentListener();

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

@@ -7,6 +7,7 @@ spec:
     image: jenkins/inbound-agent:windowsservercore-1809
   nodeSelector:
     kubernetes.io/os: windows
+    node.kubernetes.io/windows-build: 10.0.17763
 '''
 ) {
     node(POD_LABEL) {

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

@@ -14,6 +14,7 @@ spec:
     - 999999
   nodeSelector:
     kubernetes.io/os: windows
+    node.kubernetes.io/windows-build: 10.0.17763
 ''') {
     node(POD_LABEL) {
         container('shell') {

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

@@ -26,6 +26,7 @@ spec:
           name: container-secret
   nodeSelector:
     kubernetes.io/os: windows
+    node.kubernetes.io/windows-build: 10.0.17763
 ''') {
     node(POD_LABEL) {
         powershell 'echo "INSIDE_POD_ENV_VAR_FROM_SECRET = $Env:POD_ENV_VAR_FROM_SECRET or $($Env:POD_ENV_VAR_FROM_SECRET.ToUpper())"'

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

@@ -14,6 +14,7 @@ spec:
     - 999999
   nodeSelector:
     kubernetes.io/os: windows
+    node.kubernetes.io/windows-build: 10.0.17763
 '''
 ) {
     node(POD_LABEL) {

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

@@ -14,6 +14,7 @@ spec:
     - 999999
   nodeSelector:
     kubernetes.io/os: windows
+    node.kubernetes.io/windows-build: 10.0.17763
 ''') {
     node(POD_LABEL) {
         container('shell') {