diff --git a/kubernetes/ftest-kubernetes-assistant/src/test/resources/kubernetes.json b/kubernetes/ftest-kubernetes-assistant/src/test/resources/kubernetes.json index 234a15e9f..56dc1fe10 100644 --- a/kubernetes/ftest-kubernetes-assistant/src/test/resources/kubernetes.json +++ b/kubernetes/ftest-kubernetes-assistant/src/test/resources/kubernetes.json @@ -39,6 +39,7 @@ "spec" : { "containers" : [ { "image" : "openshift/hello-openshift:v3.6.0", + "imagePullPolicy": "IfNotPresent", "name" : "hello-world-container", "ports" : [ { "name" : "http", diff --git a/kubernetes/ftest-kubernetes-logs/src/test/resources/kubernetes.json b/kubernetes/ftest-kubernetes-logs/src/test/resources/kubernetes.json index 291bb7265..7927e2d95 100644 --- a/kubernetes/ftest-kubernetes-logs/src/test/resources/kubernetes.json +++ b/kubernetes/ftest-kubernetes-logs/src/test/resources/kubernetes.json @@ -12,6 +12,7 @@ "containers": [ { "image": "busybox", + "imagePullPolicy": "IfNotPresent", "name": "only-container", "command": ["/bin/sh"], "args": ["-c", "while true; do sleep 1; file=\"/tmp/healthy\"; if [[ ! -f $file ]]; then touch $file; fi; echo only-one; done"], @@ -37,6 +38,7 @@ "containers": [ { "image": "busybox", + "imagePullPolicy": "IfNotPresent", "name": "first-container", "command": ["/bin/sh"], "args": ["-c", "while true; do sleep 1; file=\"/tmp/healthy\"; if [[ ! -f $file ]]; then touch $file; fi; echo first; done"], @@ -50,6 +52,7 @@ }, { "image": "busybox", + "imagePullPolicy": "IfNotPresent", "name": "second-container", "command": ["/bin/sh"], "args": ["-c", "while true; do sleep 1; file=\"/tmp/healthy\"; if [[ ! -f $file ]]; then touch $file; fi; echo second; done"], diff --git a/kubernetes/ftest-kubernetes-reporter/src/test/resources/kubernetes.json b/kubernetes/ftest-kubernetes-reporter/src/test/resources/kubernetes.json index c9fa36cf7..f1f1400a5 100644 --- a/kubernetes/ftest-kubernetes-reporter/src/test/resources/kubernetes.json +++ b/kubernetes/ftest-kubernetes-reporter/src/test/resources/kubernetes.json @@ -37,6 +37,7 @@ "spec" : { "containers" : [ { "image" : "openshift/hello-openshift:v3.6.0", + "imagePullPolicy": "IfNotPresent", "name" : "hello-world-container", "ports" : [ { "name" : "http", diff --git a/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world-2.yaml b/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world-2.yaml index 93ccfe9aa..2683d1883 100644 --- a/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world-2.yaml +++ b/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world-2.yaml @@ -27,6 +27,7 @@ spec: spec: containers: - image: openshift/hello-openshift:v3.6.0 + imagePullPolicy: IfNotPresent name: hello-world-container ports: - name: http diff --git a/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world.yaml b/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world.yaml index c7ed4c6f0..f73ec4a33 100644 --- a/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world.yaml +++ b/kubernetes/ftest-kubernetes-resources/src/test/resources/hello-world.yaml @@ -27,6 +27,7 @@ spec: spec: containers: - image: openshift/hello-openshift:v3.6.0 + imagePullPolicy: IfNotPresent name: hello-world-container ports: - name: http diff --git a/kubernetes/ftest-kubernetes/src/test/resources/kubernetes.yaml b/kubernetes/ftest-kubernetes/src/test/resources/kubernetes.yaml index c7ed4c6f0..38d20fdfe 100644 --- a/kubernetes/ftest-kubernetes/src/test/resources/kubernetes.yaml +++ b/kubernetes/ftest-kubernetes/src/test/resources/kubernetes.yaml @@ -27,6 +27,7 @@ spec: spec: containers: - image: openshift/hello-openshift:v3.6.0 + imagePullPolicy: Always name: hello-world-container ports: - name: http diff --git a/openshift/ftest-containerless/src/test/resources/hello_pod.json b/openshift/ftest-containerless/src/test/resources/hello_pod.json index 46ec51949..ef5edfbc3 100644 --- a/openshift/ftest-containerless/src/test/resources/hello_pod.json +++ b/openshift/ftest-containerless/src/test/resources/hello_pod.json @@ -11,13 +11,14 @@ "containers": [{ "name": "hello-openshift", "image": "arquillian:./src/test/resources/wildfly", - "ports": [ - { - "hostPort": 8080, - "containerPort": 8080, - "protocol": "TCP" - } - ] + "imagePullPolicy": "IfNotPresent", + "ports": [ + { + "hostPort": 8080, + "containerPort": 8080, + "protocol": "TCP" + } + ] }] } } diff --git a/openshift/ftest-oc-proxy/src/test/resources/openshift.json b/openshift/ftest-oc-proxy/src/test/resources/openshift.json index 234a15e9f..43766f51b 100644 --- a/openshift/ftest-oc-proxy/src/test/resources/openshift.json +++ b/openshift/ftest-oc-proxy/src/test/resources/openshift.json @@ -40,6 +40,7 @@ "containers" : [ { "image" : "openshift/hello-openshift:v3.6.0", "name" : "hello-world-container", + "imagePullPolicy": "IfNotPresent", "ports" : [ { "name" : "http", "protocol" : "TCP", diff --git a/openshift/ftest-openshift-assistant/src/test/resources/openshift.json b/openshift/ftest-openshift-assistant/src/test/resources/openshift.json index 234a15e9f..43766f51b 100644 --- a/openshift/ftest-openshift-assistant/src/test/resources/openshift.json +++ b/openshift/ftest-openshift-assistant/src/test/resources/openshift.json @@ -40,6 +40,7 @@ "containers" : [ { "image" : "openshift/hello-openshift:v3.6.0", "name" : "hello-world-container", + "imagePullPolicy": "IfNotPresent", "ports" : [ { "name" : "http", "protocol" : "TCP", diff --git a/openshift/ftest-openshift-graphene/src/test/resources/openshift.json b/openshift/ftest-openshift-graphene/src/test/resources/openshift.json index eff170d76..7a836a0f6 100644 --- a/openshift/ftest-openshift-graphene/src/test/resources/openshift.json +++ b/openshift/ftest-openshift-graphene/src/test/resources/openshift.json @@ -40,6 +40,7 @@ "containers" : [ { "image" : "openshift/hello-openshift:v3.6.0", "name" : "hello-world-container", + "imagePullPolicy": "IfNotPresent", "ports" : [ { "name" : "http", "protocol" : "TCP", diff --git a/openshift/ftest-openshift-resources-standalone/src/test/resources/hello-openshift.json b/openshift/ftest-openshift-resources-standalone/src/test/resources/hello-openshift.json index 234a15e9f..56dc1fe10 100644 --- a/openshift/ftest-openshift-resources-standalone/src/test/resources/hello-openshift.json +++ b/openshift/ftest-openshift-resources-standalone/src/test/resources/hello-openshift.json @@ -39,6 +39,7 @@ "spec" : { "containers" : [ { "image" : "openshift/hello-openshift:v3.6.0", + "imagePullPolicy": "IfNotPresent", "name" : "hello-world-container", "ports" : [ { "name" : "http", diff --git a/openshift/ftest-openshift-restassured/src/test/resources/openshift.json b/openshift/ftest-openshift-restassured/src/test/resources/openshift.json index 8227a3a9b..376b42171 100644 --- a/openshift/ftest-openshift-restassured/src/test/resources/openshift.json +++ b/openshift/ftest-openshift-restassured/src/test/resources/openshift.json @@ -40,6 +40,7 @@ "containers" : [ { "image" : "openshift/hello-openshift:v3.6.0", "name" : "hello-openshift-container", + "imagePullPolicy": "IfNotPresent", "ports" : [ { "name" : "http", "protocol" : "TCP", diff --git a/openshift/ftest/src/test/resources/hello_pod.json b/openshift/ftest/src/test/resources/hello_pod.json index dc66cd88c..ce6a7b6b1 100644 --- a/openshift/ftest/src/test/resources/hello_pod.json +++ b/openshift/ftest/src/test/resources/hello_pod.json @@ -11,16 +11,17 @@ "containers": [{ "name": "hello-openshift", "image": "arquillian:./src/test/resources/wildfly", - "ports": [ - { - "containerPort": 8080, - "protocol": "TCP" - }, - { - "containerPort": 9990, - "protocol": "TCP" - } - ], + "imagePullPolicy": "IfNotPresent", + "ports": [ + { + "containerPort": 8080, + "protocol": "TCP" + }, + { + "containerPort": 9990, + "protocol": "TCP" + } + ], "readinessProbe" : { "exec": { "command": [