Skip to content

Commit b5541c5

Browse files
jshum2479jshum2479
committed
Merge branch 'db-op-install' into 'release/4.2'
Install Database operator once and use it for all tests See merge request weblogic-cloud/weblogic-kubernetes-operator!4720
2 parents 94a0139 + 6098537 commit b5541c5

File tree

11 files changed

+27
-43
lines changed

11 files changed

+27
-43
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@
104104
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuAccessSecret;
105105
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
106106
import static oracle.weblogic.kubernetes.utils.DbUtils.deleteOracleDB;
107-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
108-
import static oracle.weblogic.kubernetes.utils.DbUtils.uninstallDBOperator;
109107
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
110108
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileToPod;
111109
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
@@ -220,10 +218,8 @@ public static void initAll(@Namespaces(4) List<String> namespaces) throws ApiExc
220218
createBaseRepoSecret(fmwDomainNamespace);
221219
createBaseRepoSecret(wlsDomainNamespace);
222220

223-
//install Oracle Database Operator
224-
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
225-
226221
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
222+
createBaseRepoSecret(dbNamespace);
227223
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
228224

229225
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
@@ -649,7 +645,6 @@ private void testMiiJmsJtaServiceMigration() {
649645
public void tearDownAll() throws ApiException {
650646
if (!SKIP_CLEANUP) {
651647
deleteOracleDB(dbNamespace, dbName);
652-
uninstallDBOperator(dbNamespace);
653648
Kubernetes.deletePv(pvName);
654649
}
655650
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getServiceExtIPAddrtOke;
8383
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
8484
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
85-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
8685
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
8786
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFolder;
8887
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
@@ -187,9 +186,6 @@ public static void initAll(@Namespaces(4) List<String> namespaces) throws Unknow
187186
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
188187
dbUrl = ORACLEDBURLPREFIX + domain2Namespace + ORACLEDBSUFFIX;
189188
createBaseRepoSecret(domain2Namespace);
190-
191-
//install Oracle Database Operator
192-
assertDoesNotThrow(() -> installDBOperator(domain2Namespace), "Failed to install database operator");
193189

194190
logger.info("Create Oracle DB in namespace: {0} ", domain2Namespace);
195191
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, SYSPASSWORD, domain2Namespace));

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@
7373
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuAccessSecret;
7474
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
7575
import static oracle.weblogic.kubernetes.utils.DbUtils.deleteOracleDB;
76-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
77-
import static oracle.weblogic.kubernetes.utils.DbUtils.uninstallDBOperator;
7876
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
7977
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
8078
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileToPod;
@@ -187,9 +185,7 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
187185
// this secret is used only for non-kind cluster
188186
createBaseRepoSecret(fmwDomainNamespace);
189187
createBaseRepoSecret(wlsDomainNamespace);
190-
191-
//install Oracle Database Operator
192-
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
188+
createBaseRepoSecret(dbNamespace);
193189

194190
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
195191
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
@@ -521,7 +517,6 @@ private void testMiiJmsJtaServiceMigration() {
521517
public void tearDownAll() throws ApiException {
522518
if (!SKIP_CLEANUP) {
523519
deleteOracleDB(dbNamespace, dbName);
524-
uninstallDBOperator(dbNamespace);
525520
}
526521
}
527522

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
4141
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
4242
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
43-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
4443
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
4544
import static oracle.weblogic.kubernetes.utils.FmwUtils.createDomainResourceOnPv;
4645
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
@@ -124,10 +123,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
124123

125124
DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/";
126125

127-
//install Oracle Database Operator
128-
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
129-
130126
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
127+
createBaseRepoSecret(dbNamespace);
131128
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
132129

133130
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
5252
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
5353
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
54-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
5554
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
5655
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5756
import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
@@ -122,10 +121,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
122121
assertNotNull(namespaces.get(2), "Namespace is null");
123122
jrfDomainNamespace = namespaces.get(2);
124123

125-
//install Oracle Database Operator
126-
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
127-
128124
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
125+
createBaseRepoSecret(dbNamespace);
129126
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
130127

131128
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
5151
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
5252
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
53-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
5453
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
5554
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
5655
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyEMconsoleAccess;
@@ -130,10 +129,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
130129
assertNotNull(namespaces.get(2), "Namespace is null");
131130
domainNamespace = namespaces.get(2);
132131

133-
//install Oracle Database Operator
134-
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
135-
136132
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
133+
createBaseRepoSecret(dbNamespace);
137134
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
138135

139136
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getServiceExtIPAddrtOke;
6666
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
6767
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
68-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
6968
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
7069
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFolder;
7170
import static oracle.weblogic.kubernetes.utils.FileUtils.generateFileFromTemplate;
7271
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
72+
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
7373
import static oracle.weblogic.kubernetes.utils.ImageUtils.createImageAndVerify;
7474
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
7575
import static oracle.weblogic.kubernetes.utils.ImageUtils.imageRepoLoginAndPushImageToRegistry;
@@ -148,10 +148,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) throws Unknow
148148
assertNotNull(namespaces.get(2), "Namespace list is null");
149149
domain2Namespace = namespaces.get(2);
150150

151-
//install Oracle Database Operator
152-
assertDoesNotThrow(() -> installDBOperator(domain2Namespace), "Failed to install database operator");
153-
154151
logger.info("Create Oracle DB in namespace: {0} ", domain2Namespace);
152+
createBaseRepoSecret(domain2Namespace);
155153
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, SYSPASSWORD, domain2Namespace));
156154

157155
// Now that we got the namespaces for both the domains, we need to update the model properties

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapAndVerify;
8282
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
8383
import static oracle.weblogic.kubernetes.utils.DbUtils.deleteOracleDB;
84-
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
85-
import static oracle.weblogic.kubernetes.utils.DbUtils.uninstallDBOperator;
8684
import static oracle.weblogic.kubernetes.utils.FileUtils.copyFileToPod;
8785
import static oracle.weblogic.kubernetes.utils.FileUtils.generateFileFromTemplate;
8886
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
@@ -181,10 +179,8 @@ public static void initAll(@Namespaces(4) List<String> namespaces) {
181179
assertDoesNotThrow(() -> addLabelsToNamespace(wlsDomainNamespace, labelMap));
182180
assertDoesNotThrow(() -> addLabelsToNamespace(opNamespace, labelMap));
183181

184-
//install Oracle Database Operator
185-
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
186-
187182
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
183+
createBaseRepoSecret(dbNamespace);
188184
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
189185

190186
// create testwebapp.war
@@ -385,7 +381,6 @@ private void testMiiJmsJtaServiceMigration() throws UnknownHostException {
385381
public void tearDownAll() throws ApiException {
386382
if (!SKIP_CLEANUP) {
387383
deleteOracleDB(dbNamespace, dbName);
388-
uninstallDBOperator(dbNamespace);
389384
}
390385
}
391386

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,8 @@ public interface TestConstants {
476476
public static final String LARGE_DOMAIN_TESTING_PROPS_FILE =
477477
"largedomaintesting.props";
478478

479+
public static final String ORACLE_OPERATOR_NS = "ns-oracle-operator";
480+
479481
//node ports used by the integration tests
480482
public static final int IT_EXTERNALNODEPORTSERVICE_NODEPORT = 31000;
481483
public static final int IT_EXTERNALNODEPORTSERVICE_HOSTPORT = 2100;

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
6969
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_CHART_DIR;
7070
import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
71+
import static oracle.weblogic.kubernetes.TestConstants.ORACLE_OPERATOR_NS;
7172
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
7273
import static oracle.weblogic.kubernetes.TestConstants.SKIP_BUILD_IMAGES_IF_EXISTS;
7374
import static oracle.weblogic.kubernetes.TestConstants.SKIP_CLEANUP;
@@ -107,6 +108,7 @@
107108
import static oracle.weblogic.kubernetes.assertions.TestAssertions.doesImageExist;
108109
import static oracle.weblogic.kubernetes.assertions.TestAssertions.imageExists;
109110
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
111+
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
110112
import static oracle.weblogic.kubernetes.utils.FileUtils.checkDirectory;
111113
import static oracle.weblogic.kubernetes.utils.FileUtils.cleanupDirectory;
112114
import static oracle.weblogic.kubernetes.utils.IstioUtils.installIstio;
@@ -308,6 +310,8 @@ public void beforeAll(ExtensionContext context) {
308310
if (!TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
309311
installTraefikLB();
310312
}
313+
//install Oracle Database operator as a one time task
314+
installOracleDBOperator();
311315

312316
// set initialization success to true, not counting the istio installation as not all tests use istio
313317
isInitializationSuccessful = true;
@@ -363,6 +367,7 @@ public void close() {
363367
if (!OKD && !OKE_CLUSTER && !OCNE && !CRIO) {
364368
logger.info("Delete istio-system namespace after all test suites are run");
365369
deleteNamespace("istio-system");
370+
deleteNamespace(ORACLE_OPERATOR_NS);
366371
}
367372
logger.info("Cleanup WIT/WDT binary form {0}", RESULTS_ROOT);
368373
try {
@@ -662,6 +667,13 @@ private void installTraefikLB() {
662667
//expose traefik node port service and get route host
663668
//oc -n ns-abcdef expose service nginx-release-nginx-ingress-nginx-controller
664669
//oc -n ns-abcdef get routes nginx-release-nginx-ingress-nginx-controller '-o=jsonpath={.spec.host}'
665-
}
670+
}
671+
672+
private void installOracleDBOperator() {
673+
//install Oracle Database Operator
674+
String namespace = ORACLE_OPERATOR_NS;
675+
assertDoesNotThrow(() -> new Namespace().name(namespace).create());
676+
assertDoesNotThrow(() -> installDBOperator(), "Failed to install database operator");
677+
}
666678

667679
}

0 commit comments

Comments
 (0)