From 1473efc090d417b6686b592a77d0706557231232 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Thu, 22 May 2025 11:17:42 +0300 Subject: [PATCH] Allow image pull policy to be injected for tests that use test images --- test/e2e/local/helidon-cluster-2.yaml | 1 + test/e2e/local/helidon-cluster-3.yaml | 1 + test/e2e/local/helidon-cluster.yaml | 1 + test/e2e/local/job-test.yaml | 1 + test/e2e/local/job-with-ready-action.yaml | 1 + test/e2e/local/management-jib-test.yaml | 1 + test/e2e/local/metrics-jib-test.yaml | 1 + test/e2e/local/spring-buildpack-cluster-2.yaml | 1 + test/e2e/local/spring-buildpack-cluster.yaml | 1 + test/e2e/local/spring-cluster-2.yaml | 1 + test/e2e/local/spring-cluster.yaml | 1 + test/e2e/local/spring-fat-jar-cluster-2.yaml | 1 + test/e2e/local/spring-fat-jar-cluster.yaml | 1 + 13 files changed, 13 insertions(+) diff --git a/test/e2e/local/helidon-cluster-2.yaml b/test/e2e/local/helidon-cluster-2.yaml index 4cad9511f..fee99071f 100644 --- a/test/e2e/local/helidon-cluster-2.yaml +++ b/test/e2e/local/helidon-cluster-2.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_HELIDON_2} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: helidon jvm: diff --git a/test/e2e/local/helidon-cluster-3.yaml b/test/e2e/local/helidon-cluster-3.yaml index f2d65b6bd..e26b2bfc6 100644 --- a/test/e2e/local/helidon-cluster-3.yaml +++ b/test/e2e/local/helidon-cluster-3.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_HELIDON_3} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: helidon jvm: diff --git a/test/e2e/local/helidon-cluster.yaml b/test/e2e/local/helidon-cluster.yaml index 99b98a5bf..78cd2180d 100644 --- a/test/e2e/local/helidon-cluster.yaml +++ b/test/e2e/local/helidon-cluster.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_HELIDON} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: helidon jvm: diff --git a/test/e2e/local/job-test.yaml b/test/e2e/local/job-test.yaml index af0194ef4..c20b7d028 100644 --- a/test/e2e/local/job-test.yaml +++ b/test/e2e/local/job-test.yaml @@ -5,6 +5,7 @@ metadata: spec: cluster: test image: ${TEST_APPLICATION_IMAGE} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} restartPolicy: Never env: - name: APPLICATION_LIFETIME_SECONDS diff --git a/test/e2e/local/job-with-ready-action.yaml b/test/e2e/local/job-with-ready-action.yaml index 3661f5125..992581509 100644 --- a/test/e2e/local/job-with-ready-action.yaml +++ b/test/e2e/local/job-with-ready-action.yaml @@ -6,6 +6,7 @@ spec: cluster: test replicas: 3 image: ${TEST_APPLICATION_IMAGE} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} restartPolicy: Never readyAction: httpGet: diff --git a/test/e2e/local/management-jib-test.yaml b/test/e2e/local/management-jib-test.yaml index a8b7f8eee..18edc6106 100644 --- a/test/e2e/local/management-jib-test.yaml +++ b/test/e2e/local/management-jib-test.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 1 image: ${TEST_APPLICATION_IMAGE} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} coherence: management: enabled: true diff --git a/test/e2e/local/metrics-jib-test.yaml b/test/e2e/local/metrics-jib-test.yaml index 08886fc7e..e3494800f 100644 --- a/test/e2e/local/metrics-jib-test.yaml +++ b/test/e2e/local/metrics-jib-test.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 1 image: ${TEST_APPLICATION_IMAGE} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} coherence: metrics: enabled: true diff --git a/test/e2e/local/spring-buildpack-cluster-2.yaml b/test/e2e/local/spring-buildpack-cluster-2.yaml index 94eb72e6a..1c0743ad5 100644 --- a/test/e2e/local/spring-buildpack-cluster-2.yaml +++ b/test/e2e/local/spring-buildpack-cluster-2.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_SPRING_CNBP_2} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: spring useImageEntryPoint: true diff --git a/test/e2e/local/spring-buildpack-cluster.yaml b/test/e2e/local/spring-buildpack-cluster.yaml index fe91e7c07..a9858ea89 100644 --- a/test/e2e/local/spring-buildpack-cluster.yaml +++ b/test/e2e/local/spring-buildpack-cluster.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_SPRING_CNBP} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: spring3 useImageEntryPoint: true diff --git a/test/e2e/local/spring-cluster-2.yaml b/test/e2e/local/spring-cluster-2.yaml index 932a64cde..edfd9026e 100644 --- a/test/e2e/local/spring-cluster-2.yaml +++ b/test/e2e/local/spring-cluster-2.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_SPRING_2} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: spring workingDir: /spring diff --git a/test/e2e/local/spring-cluster.yaml b/test/e2e/local/spring-cluster.yaml index 7f666c85f..20f24e171 100644 --- a/test/e2e/local/spring-cluster.yaml +++ b/test/e2e/local/spring-cluster.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_SPRING} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: spring3 workingDir: /spring diff --git a/test/e2e/local/spring-fat-jar-cluster-2.yaml b/test/e2e/local/spring-fat-jar-cluster-2.yaml index 8bbd02b5e..7ca0fa443 100644 --- a/test/e2e/local/spring-fat-jar-cluster-2.yaml +++ b/test/e2e/local/spring-fat-jar-cluster-2.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_SPRING_FAT_2} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: spring springBootFatJar: /app/libs/operator-test-spring-2-${MVN_VERSION}.jar diff --git a/test/e2e/local/spring-fat-jar-cluster.yaml b/test/e2e/local/spring-fat-jar-cluster.yaml index 2928a0f9e..7af95b600 100644 --- a/test/e2e/local/spring-fat-jar-cluster.yaml +++ b/test/e2e/local/spring-fat-jar-cluster.yaml @@ -5,6 +5,7 @@ metadata: spec: replicas: 3 image: ${TEST_APPLICATION_IMAGE_SPRING_FAT} + imagePullPolicy: ${TEST_IMAGE_PULL_POLICY} application: type: spring3 springBootFatJar: /app/libs/operator-test-spring-${MVN_VERSION}.jar