Skip to content

Commit bc321af

Browse files
committed
Merge branch 'nginx40' into 'release/4.0'
Resolution to NGINX installation (Release/4.0) See merge request weblogic-cloud/weblogic-kubernetes-operator!4207
2 parents af9ae80 + d858899 commit bc321af

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

integration-tests/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,8 @@
268268
<wko.it.opdemo>${wko.it.opdemo}</wko.it.opdemo>
269269
<wko.it.image.name.operator>${wko.it.image.name.operator}</wko.it.image.name.operator>
270270
<wko.it.image.tag.operator>${wko.it.image.tag.operator}</wko.it.image.tag.operator>
271+
<wko.it.base.images.tenancy>${wko.it.base.images.tenancy}</wko.it.base.images.tenancy>
272+
<wko.it.test.images.tenancy>${wko.it.test.images.tenancy}</wko.it.test.images.tenancy>
271273
</systemPropertyVariables>
272274
<trimStackTrace>false</trimStackTrace>
273275
</configuration>

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ public interface TestConstants {
176176
public static final String NGINX_CHART_VERSION = "4.0.17";
177177
public static final String NGINX_INGRESS_IMAGE_DIGEST =
178178
"sha256:314435f9465a7b2973e3aa4f2edad7465cc7bcdc8304be5d146d70e4da136e51";
179-
public static final String TEST_NGINX_IMAGE_NAME = "test-images/ingress-nginx/controller";
179+
public static final String TEST_NGINX_IMAGE_NAME = TEST_IMAGES_TENANCY + "/test-images/ingress-nginx/controller";
180180
public static final String NGINX_INGRESS_IMAGE_TAG = "v1.2.0";
181181

182182
// Traefik constants

0 commit comments

Comments
 (0)