Skip to content

Commit 5430b69

Browse files
sankarpnsankarpn
committed
anges for Vanaja's comments
1 parent 50956b3 commit 5430b69

File tree

4 files changed

+37
-27
lines changed

4 files changed

+37
-27
lines changed

‎integration-tests/src/test/java/oracle/kubernetes/operator/BaseTest.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public class BaseTest {
6969
protected static String appLocationInPod = "/u01/oracle/apps";
7070
private static String appLocationOnHost;
7171
private static Properties appProps;
72-
private static String imageTag;
73-
private static String imageName;
72+
private static String weblogicImageTag;
73+
private static String weblogicImageName;
7474

7575
// Set QUICKTEST env var to true to run a small subset of tests.
7676
// Set SMOKETEST env var to true to run an even smaller subset of tests
@@ -106,8 +106,14 @@ public static void initialize(String appPropsFile) throws Exception {
106106
}
107107
username = appProps.getProperty("username", username);
108108
password = appProps.getProperty("password", password);
109-
imageTag = appProps.getProperty("weblogicImageTag");
110-
imageName = appProps.getProperty("weblogicImageName");
109+
weblogicImageTag =
110+
System.getenv("IMAGE_TAG_WEBLOGIC") != null
111+
? System.getenv("IMAGE_TAG_WEBLOGIC")
112+
: appProps.getProperty("weblogicImageTag");
113+
weblogicImageName =
114+
System.getenv("IMAGE_NAME_WEBLOGIC") != null
115+
? System.getenv("IMAGE_NAME_WEBLOGIC")
116+
: appProps.getProperty("weblogicImageName");
111117
maxIterationsPod =
112118
new Integer(appProps.getProperty("maxIterationsPod", "" + maxIterationsPod)).intValue();
113119
waitTimePod = new Integer(appProps.getProperty("waitTimePod", "" + waitTimePod)).intValue();
@@ -232,21 +238,21 @@ public static void initialize(String appPropsFile) throws Exception {
232238
}
233239

234240
/**
235-
* getter method for imageTag field
241+
* getter method for weblogicImageTag field
236242
*
237243
* @return image tag of the WLS docker images
238244
*/
239-
public static String getImageTag() {
240-
return imageTag;
245+
public static String getWeblogicImageTag() {
246+
return weblogicImageTag;
241247
}
242248

243249
/**
244-
* getter method for imageName
250+
* getter method for weblogicImageName
245251
*
246252
* @return image name of the WLS docker image
247253
*/
248-
public static String getImageName() {
249-
return imageName;
254+
public static String getWeblogicImageName() {
255+
return weblogicImageName;
250256
}
251257
/**
252258
* Call the basic usecases tests

‎integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -200,17 +200,18 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
200200
"About to verifyDomainServerPodRestart for Domain: "
201201
+ domain.getDomainUid()
202202
+ " Image property: "
203-
+ getImageName()
203+
+ getWeblogicImageName()
204204
+ ":"
205-
+ getImageTag()
205+
+ getWeblogicImageTag()
206206
+ " to /weblogick8s/middleware/weblogic:duplicate");
207207

208208
if (BaseTest.SHARED_CLUSTER) {
209209
String newImage =
210210
System.getenv("REPO_REGISTRY") + "/weblogick8s/middleware/weblogic:duplicate";
211211

212212
// tag image with repo name
213-
TestUtils.exec("docker tag " + getImageName() + ":" + getImageTag() + " " + newImage);
213+
TestUtils.exec(
214+
"docker tag " + getWeblogicImageName() + ":" + getWeblogicImageTag() + " " + newImage);
214215

215216
// login and push image to ocir
216217
TestUtils.loginAndPushImageToOCIR(newImage);
@@ -227,23 +228,24 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
227228

228229
// apply new domain yaml and verify pod restart
229230
domain.verifyDomainServerPodRestart(
230-
"\"" + getImageName() + ":" + getImageTag() + "\"", "\"" + newImage + "\"");
231+
"\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
232+
"\"" + newImage + "\"");
231233
} else {
232234
TestUtils.exec(
233235
"docker tag "
234-
+ getImageName()
236+
+ getWeblogicImageName()
235237
+ ":"
236-
+ getImageTag()
238+
+ getWeblogicImageTag()
237239
+ " "
238-
+ getImageName()
240+
+ getWeblogicImageName()
239241
+ ":duplicate");
240242
domain.verifyDomainServerPodRestart(
241-
"\"" + getImageName() + ":" + getImageTag() + "\"",
242-
"\"" + getImageName() + ":duplicate" + "\"");
243+
"\"" + getWeblogicImageName() + ":" + getWeblogicImageTag() + "\"",
244+
"\"" + getWeblogicImageName() + ":duplicate" + "\"");
243245
}
244246
} finally {
245247
if (!BaseTest.SHARED_CLUSTER) {
246-
TestUtils.exec("docker rmi -f " + getImageName() + ":duplicate");
248+
TestUtils.exec("docker rmi -f " + getWeblogicImageName() + ":duplicate");
247249
}
248250
}
249251

‎integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,8 +1384,8 @@ private void callWebAppAndCheckForServerNameInResponse(
13841384
* accessed to read or if creating config map or secret fails for configoverrides
13851385
*/
13861386
protected void initialize(Map<String, Object> inputDomainMap) throws Exception {
1387-
imageTag = BaseTest.getImageTag();
1388-
imageName = BaseTest.getImageName();
1387+
imageTag = BaseTest.getWeblogicImageTag();
1388+
imageName = BaseTest.getWeblogicImageName();
13891389
domainMap = inputDomainMap;
13901390
this.userProjectsDir = BaseTest.getUserProjectsDir();
13911391
this.projectRoot = BaseTest.getProjectRoot();

‎integration-tests/src/test/resources/setupenv.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function pull_tag_images {
8787
echo "Creating Docker Secret"
8888

8989
kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC \
90-
--docker-server=container-registry.oracle.com/ \
90+
--docker-server=${WL_DOCKER_SERVER}/ \
9191
--docker-username=$DOCKER_USERNAME \
9292
--docker-password=$DOCKER_PASSWORD \
9393
--docker-email=$DOCKER_EMAIL
@@ -99,7 +99,7 @@ function pull_tag_images {
9999
exit 1
100100
fi
101101
# below docker pull is needed to get wlthint3client.jar from image to put in the classpath
102-
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD container-registry.oracle.com
102+
docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD ${WL_DOCKER_SERVER}
103103
docker pull $IMAGE_NAME_WEBLOGIC:$IMAGE_TAG_WEBLOGIC
104104
fi
105105
set -x
@@ -149,7 +149,7 @@ set +x
149149
echo "Creating Docker Secret"
150150

151151
kubectl create secret docker-registry $IMAGE_PULL_SECRET_ORACLEDB \
152-
--docker-server=container-registry.oracle.com/ \
152+
--docker-server=${WL_DOCKER_SERVER}/ \
153153
--docker-username=$DOCKER_USERNAME \
154154
--docker-password=$DOCKER_PASSWORD \
155155
--docker-email=$DOCKER_EMAIL
@@ -179,6 +179,8 @@ function get_wlthint3client_from_image {
179179
docker rm -v $id
180180

181181
}
182+
export WL_DOCKER_SERVER=container-registry.oracle.com
183+
export WLS_IMAGE_URI=/middleware/weblogic
182184
export SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
183185
export PROJECT_ROOT="$SCRIPTPATH/../../../.."
184186
export RESULT_ROOT=${RESULT_ROOT:-/scratch/$USER/wl_k8s_test_results}
@@ -195,7 +197,7 @@ if [ "$JRF_ENABLED" = true ] ; then
195197
export IMAGE_PULL_SECRET_ORACLEDB="${IMAGE_PULL_SECRET_ORACLEDB:-docker-store}"
196198

197199
fi
198-
export IMAGE_NAME_WEBLOGIC="${IMAGE_NAME_WEBLOGIC:-container-registry.oracle.com/middleware/weblogic}"
200+
export IMAGE_NAME_WEBLOGIC="${IMAGE_NAME_WEBLOGIC:-`echo ${WL_DOCKER_SERVER}``echo ${WLS_IMAGE_URI}`}"
199201
export IMAGE_PULL_SECRET_WEBLOGIC="${IMAGE_PULL_SECRET_WEBLOGIC:-docker-store}"
200202

201203
if [ -z "$BRANCH_NAME" ]; then
@@ -261,7 +263,7 @@ if [ "$SHARED_CLUSTER" = "true" ]; then
261263

262264
echo "Creating Docker Secret"
263265
kubectl create secret docker-registry $IMAGE_PULL_SECRET_WEBLOGIC \
264-
--docker-server=container-registry.oracle.com/ \
266+
--docker-server=${WL_DOCKER_SERVER}/ \
265267
--docker-username=$DOCKER_USERNAME \
266268
--docker-password=$DOCKER_PASSWORD \
267269
--docker-email=$DOCKER_EMAIL

0 commit comments

Comments
 (0)