|
28 | 28 | import oracle.weblogic.kubernetes.utils.SemanticVersion.Compatibility;
|
29 | 29 |
|
30 | 30 | import static oracle.weblogic.kubernetes.TestConstants.ARM;
|
| 31 | +import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO; |
| 32 | +import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_TENANCY; |
31 | 33 | import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
|
32 | 34 | import static oracle.weblogic.kubernetes.TestConstants.FAILURE_RETRY_INTERVAL_SECONDS;
|
33 | 35 | import static oracle.weblogic.kubernetes.TestConstants.FAILURE_RETRY_LIMIT_MINUTES;
|
@@ -89,11 +91,12 @@ public static void installIstio() {
|
89 | 91 | Path istioInstallPath =
|
90 | 92 | Paths.get(RESULTS_ROOT, "install-istio.sh");
|
91 | 93 | String installScript = istioInstallPath.toString();
|
92 |
| - |
93 |
| - // When install istio in OCNE environment, use phx.ocir.io/devweblogic/istio-release instead of gcr.io/istio-release |
| 94 | + String ocneIstioRepo = BASE_IMAGES_REPO + "/" + BASE_IMAGES_TENANCY; |
| 95 | + // When install istio in OCNE environment, |
| 96 | + // use BASE_IMAGES_REPO/devweblogic/istio-release instead of gcr.io/istio-release |
94 | 97 | if (OCNE) {
|
95 |
| - logger.info("replace istio installation hub in File {0}", installScript); |
96 |
| - assertDoesNotThrow(() -> replaceStringInFile(installScript, "gcr.io", "phx.ocir.io/devweblogic"), |
| 98 | + logger.info("replace istio installation hub in File {0}", ocneIstioRepo); |
| 99 | + assertDoesNotThrow(() -> replaceStringInFile(installScript, "gcr.io", ocneIstioRepo), |
97 | 100 | String.format("Failed to replace string in File %s", installScript));
|
98 | 101 | }
|
99 | 102 | String arch = "linux-amd64";
|
|
0 commit comments