Skip to content

Commit 5d005cb

Browse files
authored
Modify new image used by testUpdateImageName of ItIntrospectVersion (#2446)
* modify how to create the update image name
1 parent b5f5cb9 commit 5d005cb

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import oracle.weblogic.kubernetes.utils.BuildApplication;
5050
import oracle.weblogic.kubernetes.utils.ExecResult;
5151
import oracle.weblogic.kubernetes.utils.OracleHttpClient;
52+
import oracle.weblogic.kubernetes.utils.TestUtils;
5253
import org.awaitility.core.ConditionEvaluationListener;
5354
import org.awaitility.core.ConditionFactory;
5455
import org.awaitility.core.EvaluatedCondition;
@@ -89,6 +90,7 @@
8990
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
9091
import static oracle.weblogic.kubernetes.actions.ActionConstants.WORK_DIR;
9192
import static oracle.weblogic.kubernetes.actions.TestActions.deleteSecret;
93+
import static oracle.weblogic.kubernetes.actions.TestActions.dockerTag;
9294
import static oracle.weblogic.kubernetes.actions.TestActions.execCommand;
9395
import static oracle.weblogic.kubernetes.actions.TestActions.getCurrentIntrospectVersion;
9496
import static oracle.weblogic.kubernetes.actions.TestActions.getDomainCustomResource;
@@ -118,6 +120,7 @@
118120
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createRouteForOKD;
119121
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretForBaseImages;
120122
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createSecretWithUsernamePassword;
123+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.dockerLoginAndPushImageToRegistry;
121124
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getExternalServicePodName;
122125
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getIntrospectJobName;
123126
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getPodCreationTime;
@@ -159,9 +162,7 @@ public class ItIntrospectVersion {
159162
private static String nginxNamespace = null;
160163
private static int nodeportshttp;
161164
private static HelmParams nginxHelmParams = null;
162-
private static String imageUpdate = KIND_REPO != null ? KIND_REPO
163-
+ (WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG).substring(TestConstants.BASE_IMAGES_REPO.length() + 1)
164-
: WEBLOGIC_IMAGE_NAME + ":" + WLS_UPDATE_IMAGE_TAG;
165+
165166
private final String wlSecretName = "weblogic-credentials";
166167

167168
private static String adminSvcExtHost = null;
@@ -967,8 +968,10 @@ public void testCreateNewCluster() {
967968

968969
/**
969970
* Modify the domain scope property
970-
* From: "image: container-registry.oracle.com/middleware/weblogic:12.2.1.4" to
971-
* To: "image: container-registry.oracle.com/middleware/weblogic:14.1.1.0-11"
971+
* From: "image: container-registry.oracle.com/middleware/weblogic:ImageTagBeingUsed" to
972+
* To: "image: container-registry.oracle.com/middleware/weblogic:DateAndTimeStamp"
973+
* e.g, From ""image: container-registry.oracle.com/middleware/weblogic:12.2.1.4"
974+
* To: "image:container-registry.oracle.com/middleware/weblogic:2021-07-08-162571383699"
972975
* Verify all the pods are restarted and back to ready state
973976
* Verify the admin server is accessible and cluster members are healthy
974977
* This test will be skipped if the image tag is the latest WebLogic image tag
@@ -1008,6 +1011,13 @@ public void testUpdateImageName() {
10081011
logger.info("Currently the image name used for the domain is: {0}", imageName);
10091012

10101013
//change image name to imageUpdate
1014+
String imageTag = TestUtils.getDateAndTimeStamp();
1015+
String imageUpdate = KIND_REPO != null ? KIND_REPO
1016+
+ (WEBLOGIC_IMAGE_NAME + ":" + imageTag).substring(TestConstants.BASE_IMAGES_REPO.length() + 1)
1017+
: WEBLOGIC_IMAGE_NAME + ":" + imageTag;
1018+
dockerTag(imageName, imageUpdate);
1019+
dockerLoginAndPushImageToRegistry(imageUpdate);
1020+
10111021
StringBuffer patchStr = null;
10121022
patchStr = new StringBuffer("[{");
10131023
patchStr.append("\"op\": \"replace\",")

0 commit comments

Comments
 (0)