Skip to content

Commit 4560476

Browse files
rjeberhardrjeberhard
committed
Merge branch 'dbimage' into 'release/4.2'
Use DB Image to create DB for FMW test suite before DBOperator issue is resolved on OKD See merge request weblogic-cloud/weblogic-kubernetes-operator!4773
2 parents 4fa73e2 + 26c7c90 commit 4560476

File tree

4 files changed

+68
-33
lines changed

4 files changed

+68
-33
lines changed

‎integration-tests/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -666,10 +666,6 @@
666666
<includes-failsafe>
667667
**/ItFmwDomainInPVUsingWLST,
668668
**/ItFmwDomainInPVUsingWDT,
669-
**/ItFmwDynamicClusterMiiDomain,
670-
**/ItFmwMiiDomain,
671-
**/ItMiiSampleFmwMain,
672-
**/ItMiiSampleFmwAux,
673669
**/ItFmwDomainOnPV
674670
</includes-failsafe>
675671
</properties>

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424

2525
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
2626
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
27+
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
2728
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
2829
import static oracle.weblogic.kubernetes.TestConstants.HTTPS_PROXY;
2930
import static oracle.weblogic.kubernetes.TestConstants.HTTP_PROXY;
3031
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
3132
import static oracle.weblogic.kubernetes.TestConstants.NO_PROXY;
33+
import static oracle.weblogic.kubernetes.TestConstants.OKD;
3234
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
3335
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
3436
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
@@ -40,6 +42,7 @@
4042
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
4143
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
4244
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
45+
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
4346
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
4447
import static oracle.weblogic.kubernetes.utils.FmwUtils.createDomainResourceOnPv;
4548
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
@@ -111,6 +114,11 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
111114
assertNotNull(namespaces.get(0), "Namespace is null");
112115
dbNamespace = namespaces.get(0);
113116

117+
final int dbListenerPort = getNextFreePort();
118+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
119+
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
120+
121+
114122
// get a new unique opNamespace
115123
logger.info("Assign a unique namespace for operator1");
116124
assertNotNull(namespaces.get(1), "Namespace is null");
@@ -123,14 +131,24 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
123131

124132
DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/";
125133

126-
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
127-
createBaseRepoSecret(dbNamespace);
128-
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
129-
130-
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
131-
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
132-
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
133-
dbUrl, dbNamespace));
134+
if (OKD) {
135+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
136+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
137+
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
138+
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
139+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
140+
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
141+
+ "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
142+
} else {
143+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
144+
createBaseRepoSecret(dbNamespace);
145+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
146+
147+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
148+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
149+
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
150+
dbUrl, dbNamespace));
151+
}
134152

135153
// install operator and verify its running in ready state
136154
installAndVerifyOperator(opNamespace, domainNamespace);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
4242
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
4343
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
44+
import static oracle.weblogic.kubernetes.TestConstants.OKD;
4445
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
4546
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
4647
import static oracle.weblogic.kubernetes.actions.impl.primitive.Image.getImageEnvVar;
@@ -51,6 +52,7 @@
5152
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
5253
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
5354
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
55+
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
5456
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
5557
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5658
import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
@@ -113,6 +115,11 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
113115
assertNotNull(namespaces.get(0), "Namespace is null");
114116
dbNamespace = namespaces.get(0);
115117

118+
final int dbListenerPort = getNextFreePort();
119+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
120+
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
121+
122+
116123
logger.info("Assign a unique namespace for operator");
117124
assertNotNull(namespaces.get(1), "Namespace is null");
118125
opNamespace = namespaces.get(1);
@@ -121,15 +128,26 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
121128
assertNotNull(namespaces.get(2), "Namespace is null");
122129
jrfDomainNamespace = namespaces.get(2);
123130

124-
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
125-
createBaseRepoSecret(dbNamespace);
126-
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
127-
128-
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
129-
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
130-
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
131-
dbUrl, dbNamespace));
132-
131+
if (OKD) {
132+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
133+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
134+
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
135+
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
136+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
137+
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
138+
+ "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
139+
140+
} else {
141+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
142+
createBaseRepoSecret(dbNamespace);
143+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
144+
145+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
146+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
147+
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
148+
dbUrl, dbNamespace));
149+
}
150+
133151
// install operator and verify its running in ready state
134152
installAndVerifyOperator(opNamespace, jrfDomainNamespace);
135153

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainOnPV.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
4040
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_PREFIX;
4141
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
42+
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
4243
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
4344
import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HOST;
4445
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
@@ -66,6 +67,7 @@
6667
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
6768
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuAccessSecret;
6869
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
70+
import static oracle.weblogic.kubernetes.utils.DbUtils.startOracleDB;
6971
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
7072
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainResourceOnPv;
7173
import static oracle.weblogic.kubernetes.utils.DomainUtils.deleteDomainResource;
@@ -143,18 +145,19 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
143145

144146
DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/";
145147

146-
//install Oracle Database Operator
147-
String dbName = "fmwdomainonpv1" + "my-oracle-db";
148-
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
149-
createBaseRepoSecret(dbNamespace);
150-
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
151-
/*
152-
logger.info("Start DB in namespace: {0}, dbListenerPort: {1}, dbUrl: {2}, dbImage: {3}",
153-
dbNamespace, dbListenerPort, dbUrl, DB_IMAGE_TO_USE_IN_SPEC);
154-
assertDoesNotThrow(() -> startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), dbNamespace, dbListenerPort),
155-
String.format("Failed to start Oracle DB in the namespace %s with dbUrl %s, dbListenerPost %s",
156-
dbNamespace, dbUrl, dbListenerPort));
157-
*/
148+
if (OKD) {
149+
logger.info("Start DB in namespace: {0}, dbListenerPort: {1}, dbUrl: {2}, dbImage: {3}",
150+
dbNamespace, dbListenerPort, dbUrl, DB_IMAGE_TO_USE_IN_SPEC);
151+
assertDoesNotThrow(() -> startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), dbNamespace, dbListenerPort),
152+
String.format("Failed to start Oracle DB in the namespace %s with dbUrl %s, dbListenerPost %s",
153+
dbNamespace, dbUrl, dbListenerPort));
154+
} else {
155+
String dbName = "fmwdomainonpv1" + "my-oracle-db";
156+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
157+
createBaseRepoSecret(dbNamespace);
158+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
159+
160+
}
158161
// install operator and verify its running in ready state
159162
HelmParams opHelmParams =
160163
new HelmParams().releaseName(OPERATOR_RELEASE_NAME)

0 commit comments

Comments
 (0)