Merge pull request #1284 from Vlatombe/pre-load-test-docker-images

Author: Vlatombe

kind.sh

@@ -24,9 +24,14 @@ function cleanup() {
 trap cleanup EXIT
 kubectl cluster-info
 
-DOCKER_IMAGE=$(grep -e image: test-in-k8s.yaml | cut -d ':' -f 2- | xargs)
-docker pull $DOCKER_IMAGE
-kind load docker-image $DOCKER_IMAGE --name $cluster
+PRE_LOAD_IMAGES=()
+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
+done
 
 bash test-in-k8s.sh
 rm -rf $WSTMP/surefire-reports

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/kubectlBuildWrapper_invalidCredentials.groovy

@@ -7,10 +7,11 @@ metadata:
 spec:
   containers:
   - name: kubectl
-    image: bitnami/kubectl:1.16.3
+    image: bitnami/kubectl:1.25.4
     command:
-    - cat
-    tty: true
+      - sleep
+    args:
+      - infinity
 '''
 ) {
   node(POD_LABEL) {

src/test/resources/org/csanchez/jenkins/plugins/kubernetes/kubectlBuildWrapper_missingCredentials.groovy

@@ -7,10 +7,11 @@ metadata:
 spec:
   containers:
   - name: kubectl
-    image: bitnami/kubectl:1.16.3
+    image: bitnami/kubectl:1.25.4
     command:
-    - cat
-    tty: true
+      - sleep
+    args:
+      - infinity
 '''
 ) {
   node(POD_LABEL) {