Merge branch 'master' into JENKINS-70392-tests-followup

Author: Vlatombe

Jenkinsfile

@@ -3,34 +3,55 @@ properties([
     durabilityHint('PERFORMANCE_OPTIMIZED'),
     buildDiscarder(logRotator(numToKeepStr: '5')),
 ])
-parallel kind: {
-    node('docker') {
-        timeout(90) {
-            checkout scm
-            withEnv(["WSTMP=${pwd tmp: true}"]) {
-                try {
-                    sh 'bash kind.sh'
-                    dir (WSTMP) {
-                        junit 'surefire-reports/*.xml'
-                    }
-                } finally {
-                    dir (WSTMP) {
-                        if (fileExists('kindlogs/docker-info.txt')) {
-                            archiveArtifacts 'kindlogs/'
+
+def splits
+stage('Determine splits') {
+    node('linux') {
+        checkout scm
+        splits = splitTests parallelism: count(2), generateInclusions: true, estimateTestsFromFiles: true
+    }
+}
+stage('Tests') {
+    def branches = [:]
+    branches['failFast'] = true
+
+    for (int i = 0; i < splits.size(); i++) {
+        def num = i
+        def split = splits[num]
+        def index = num + 1
+        branches["kind-${index}"] = {
+            node('docker') {
+                timeout(90) {
+                    checkout scm
+                    try {
+                        writeFile file: (split.includes ? "$WORKSPACE_TMP/includes.txt" : "$WORKSPACE_TMP/excludes.txt"), text: split.list.join("\n")
+                        writeFile file: (split.includes ? "$WORKSPACE_TMP/excludes.txt" : "$WORKSPACE_TMP/includes.txt"), text: ''
+                        sh './kind.sh -Dsurefire.includesFile="$WORKSPACE_TMP/includes.txt" -Dsurefire.excludesFile="$WORKSPACE_TMP/excludes.txt"'
+                        dir(env.WORKSPACE_TMP) {
+                            junit 'surefire-reports/*.xml'
+                        }
+                    } finally {
+                        dir(env.WORKSPACE_TMP) {
+                            if (fileExists('kindlogs/docker-info.txt')) {
+                                archiveArtifacts 'kindlogs/'
+                            }
                         }
                     }
                 }
             }
         }
     }
-}, jdk11: {
-    node('maven-11') {
-        timeout(60) {
-            checkout scm
-            sh 'mvn -B -ntp -Dset.changelist -Dmaven.test.failure.ignore clean install'
-            infra.prepareToPublishIncrementals()
-            junit 'target/surefire-reports/*.xml'
+    branches['jdk11'] = {
+        node('maven-11') {
+            timeout(60) {
+                checkout scm
+                sh 'mvn -B -ntp -Dset.changelist -Dmaven.test.failure.ignore clean install'
+                infra.prepareToPublishIncrementals()
+                junit 'target/surefire-reports/*.xml'
+            }
         }
     }
-}, failFast: true
+    parallel branches
+}
+// Stage part of the library
 infra.maybePublishIncrementals()

kind.sh

@@ -1,25 +1,25 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euxo pipefail
 
-export PATH=$WSTMP:$PATH
-if [ \! -x $WSTMP/kind ]
+export PATH=$WORKSPACE_TMP:$PATH
+if [ \! -x "$WORKSPACE_TMP/kind" ]
 then
-    curl -sLo $WSTMP/kind https://github.com/kubernetes-sigs/kind/releases/download/v0.17.0/kind-$(uname | tr '[:upper:]' '[:lower:]')-amd64
-    chmod +x $WSTMP/kind
+    curl -sLo "$WORKSPACE_TMP/kind" https://github.com/kubernetes-sigs/kind/releases/download/v0.17.0/kind-$(uname | tr '[:upper:]' '[:lower:]')-amd64
+    chmod +x "$WORKSPACE_TMP/kind"
 fi
-if [ \! -x $WSTMP/kubectl ]
+if [ \! -x "$WORKSPACE_TMP/kubectl" ]
 then
-    curl -sLo $WSTMP/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.25.4/bin/$(uname | tr '[:upper:]' '[:lower:]')/amd64/kubectl
-    chmod +x $WSTMP/kubectl
+    curl -sLo "$WORKSPACE_TMP/kubectl" https://storage.googleapis.com/kubernetes-release/release/v1.25.4/bin/$(uname | tr '[:upper:]' '[:lower:]')/amd64/kubectl
+    chmod +x "$WORKSPACE_TMP/kubectl"
 fi
 
 export cluster=ci$RANDOM
-export KUBECONFIG=$WSTMP/kubeconfig-$cluster
+export KUBECONFIG="$WORKSPACE_TMP/kubeconfig-$cluster"
 kind create cluster --name $cluster --wait 5m
 function cleanup() {
-    kind export logs --name $cluster $WSTMP/kindlogs || :
+    kind export logs --name $cluster "$WORKSPACE_TMP/kindlogs" || :
     kind delete cluster --name $cluster || :
-    rm $KUBECONFIG
+    rm "$KUBECONFIG"
 }
 trap cleanup EXIT
 kubectl cluster-info
@@ -29,10 +29,10 @@ PRE_LOAD_IMAGES+=($(grep -e image: test-in-k8s.yaml | cut -d ':' -f 2- | xargs))
 PRE_LOAD_IMAGES+=($(grep -h --include="*.groovy" -e "^\s*image: .*$" -R src/test/resources | sed -e "s/^[[:space:]]*image: //" | sort | uniq | grep -v "windows" | grep -v "nonexistent" | grep -v "invalid" | xargs))
 for image in "${PRE_LOAD_IMAGES[@]}"
 do
-  docker pull $image
-  kind load docker-image $image --name $cluster
+  docker pull "$image"
+  kind load docker-image "$image" --name $cluster
 done
 
-bash test-in-k8s.sh
-rm -rf $WSTMP/surefire-reports
-kubectl cp jenkins:/checkout/target/surefire-reports $WSTMP/surefire-reports
+./test-in-k8s.sh "$@"
+rm -rf "$WORKSPACE_TMP/surefire-reports"
+kubectl cp jenkins:/checkout/target/surefire-reports "$WORKSPACE_TMP/surefire-reports"

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

@@ -291,7 +291,6 @@ public void inheritFrom() throws Exception {
     @Test
     public void runInPodWithMultipleContainers() throws Exception {
         r.assertBuildStatusSuccess(r.waitForCompletion(b));
-        r.assertLogContains("image: \"jenkins/inbound-agent:", b);
         r.assertLogContains("image: \"maven:3.3.9-jdk-8-alpine\"", b);
         r.assertLogContains("image: \"golang:1.6.3-alpine\"", b);
         r.assertLogContains("My Kubernetes Pipeline", b);

test-in-k8s.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euxo pipefail
 function cleanup() {
     kubectl describe pod
@@ -9,21 +9,16 @@ kubectl get ns kubernetes-plugin-test || kubectl create ns kubernetes-plugin-tes
 kubectl get ns kubernetes-plugin-test-overridden-namespace || kubectl create ns kubernetes-plugin-test-overridden-namespace
 kubectl config set-context --current --namespace=kubernetes-plugin-test
 port_offset=$RANDOM
-http_port=$((2000 + $port_offset))
-tcp_port=$((2001 + $port_offset))
+http_port=$((2000 + port_offset))
+tcp_port=$((2001 + port_offset))
 kubectl delete --ignore-not-found --now pod jenkins
 sed "s/@HTTP_PORT@/$http_port/g; s/@TCP_PORT@/$tcp_port/g" < test-in-k8s.yaml | kubectl apply -f -
 kubectl wait --for=condition=Ready --timeout=15m pod/jenkins
+# Copy temporary split files
+tar cf - "$WORKSPACE_TMP" | kubectl exec -i jenkins -- tar xf -
+# Copy plugin files
 kubectl exec jenkins -- mkdir /checkout
-kubectl cp pom.xml jenkins:/checkout/pom.xml
-kubectl cp .mvn jenkins:/checkout/.mvn
-kubectl cp src jenkins:/checkout/src
-if [ -v TEST ]
-then
-    args="-Dtest=$TEST test"
-else
-    args=verify
-fi
+tar cf - pom.xml .mvn src | kubectl exec -i jenkins -- tar xf - -C /checkout
 kubectl exec jenkins -- \
         mvn \
         -B \
@@ -34,5 +29,6 @@ kubectl exec jenkins -- \
         -DslaveAgentPort=$tcp_port \
         -Djenkins.host.address=jenkins.kubernetes-plugin-test.svc.cluster.local \
         -Dmaven.test.failure.ignore \
-        $args
+        verify \
+        "$@"
 kubectl exec jenkins -- sh -c 'fgrep skipped /checkout/target/surefire-reports/*.xml' || :