Skip to content

Commit 9a180d9

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-123917' into 'main'
Add OLCNE (v1.9) daily run on main branch See merge request weblogic-cloud/weblogic-kubernetes-operator!4891
2 parents f88e424 + b71e0c5 commit 9a180d9

File tree

6 files changed

+68
-38
lines changed

6 files changed

+68
-38
lines changed

‎Jenkinsfile.ocne19‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pipeline {
1414
}
1515
triggers {
1616
// timer trigger for "nightly build"
17-
parameterizedCron(env.JOB_NAME == 'wko-ocne19-main-nightly' ?
17+
parameterizedCron(env.JOB_NAME == 'wko-ocne-main-nightly' ?
1818
CRON_SETTINGS : '')
1919
}
2020

@@ -60,8 +60,8 @@ pipeline {
6060
wle_download_url="https://github.com/oracle/weblogic-logging-exporter/releases/latest"
6161

6262
kubeconfig_file = "${WORKSPACE}/terraform/terraform/1.9/kubeconfig"
63-
availability_domain = "${env.JOB_NAME == 'wko-ocne19-main-nightly' ? 'mFEn:PHX-AD-1' : 'mFEn:PHX-AD-1'}"
64-
PARALLEL_RUN = "${env.JOB_NAME == 'wko-ocne19-main-nightly' ? true : false}"
63+
availability_domain = "${env.JOB_NAME == 'wko-ocne-main-nightly' ? 'mFEn:PHX-AD-1' : 'mFEn:PHX-AD-1'}"
64+
PARALLEL_RUN = "${env.JOB_NAME == 'wko-ocne-main-nightly' ? true : false}"
6565
}
6666

6767
parameters {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
147147

148148
DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/";
149149

150-
if (OKD) {
150+
if (OKD || OCNE) {
151151
logger.info("Start DB in namespace: {0}, dbListenerPort: {1}, dbUrl: {2}, dbImage: {3}",
152152
dbNamespace, dbListenerPort, dbUrl, DB_IMAGE_TO_USE_IN_SPEC);
153153
assertDoesNotThrow(() -> startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), dbNamespace, dbListenerPort),

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

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.HashMap;
77
import java.util.List;
88
import java.util.Map;
9-
import java.util.concurrent.Callable;
109

1110
import oracle.weblogic.kubernetes.actions.impl.UniqueName;
1211
import oracle.weblogic.kubernetes.actions.impl.primitive.Command;
@@ -55,13 +54,12 @@
5554
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.backupReports;
5655
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
5756
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.restoreReports;
58-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
59-
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.withLongRetryPolicy;
6057
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
6158
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
6259
import static oracle.weblogic.kubernetes.utils.SampleUtils.createPVHostPathAndChangePermissionInKindCluster;
6360
import static oracle.weblogic.kubernetes.utils.ThreadSafeLogger.getLogger;
6461
import static org.junit.jupiter.api.Assertions.assertNotNull;
62+
import static org.junit.jupiter.api.Assertions.assertTrue;
6563

6664
/**
6765
* Test and verify Domain on PV FMW domain sample.
@@ -250,20 +248,15 @@ public void testInitialMain() {
250248
createPVHostPathAndChangePermissionInKindCluster("/shared", envMap);
251249
}
252250

253-
testUntil(
254-
withLongRetryPolicy,
255-
checkTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main"),
256-
logger,
257-
"create PV HostPath and change Permission in Kind Cluster");
258-
251+
execTestScriptAndAssertSuccess("-initial-main", "Failed to run -initial-main");
259252
}
260253

261254
/**
262255
* Run script run-test.sh.
263256
* @param arg arguments to execute script
264257
* @param errString a string of detailed error
265258
*/
266-
private boolean execTestScriptAndAssertSuccess(String arg,
259+
private void execTestScriptAndAssertSuccess(String arg,
267260
String errString) {
268261

269262
Assumptions.assumeTrue(previousTestSuccessful);
@@ -280,8 +273,7 @@ private boolean execTestScriptAndAssertSuccess(String arg,
280273
.redirect(true)
281274
).executeAndReturnResult();
282275

283-
boolean success =
284-
result != null
276+
boolean success = result != null
285277
&& result.exitValue() == 0
286278
&& result.stdout() != null
287279
&& result.stdout().contains("Finished without errors");
@@ -293,13 +285,8 @@ private boolean execTestScriptAndAssertSuccess(String arg,
293285

294286
logger.info("output String is: {0}", outStr);
295287

296-
previousTestSuccessful = true;
297-
298-
return success;
299-
}
300-
301-
private Callable<Boolean> checkTestScriptAndAssertSuccess(String arg, String errString) {
302-
return () -> execTestScriptAndAssertSuccess(arg, errString);
288+
previousTestSuccessful = success;
289+
assertTrue(success, "running test script " + arg + " failed");
303290
}
304291

305292
/**

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,8 @@ private static void createDomain() {
11941194
uniqueDomainHome,
11951195
cluster1ReplicaCount,
11961196
t3ChannelPort,
1197-
configuration);
1197+
configuration,
1198+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC);
11981199

11991200
setPodAntiAffinity(domain);
12001201
// verify the domain custom resource is created

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

Lines changed: 54 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ public static DomainResource createDomainResourceForDomainOnPV(String domainUid,
968968
}
969969

970970
/**
971-
* Utility to create domain resource on pv with confiiguration.
971+
* Utility to create domain resource on pv with configuration.
972972
* @param domainUid domain uid
973973
* @param domNamespace domain namespace
974974
* @param adminSecretName wls admin secret name
@@ -983,16 +983,58 @@ public static DomainResource createDomainResourceForDomainOnPV(String domainUid,
983983
* @return oracle.weblogic.domain.Domain object
984984
*/
985985
public static DomainResource createDomainResourceOnPv(String domainUid,
986-
String domNamespace,
987-
String adminSecretName,
988-
String clusterName,
989-
String pvName,
990-
String pvcName,
991-
String[] repoSecretName,
992-
String domainInHomePrefix,
993-
int replicaCount,
994-
int t3ChannelPort,
995-
Configuration configuration) {
986+
String domNamespace,
987+
String adminSecretName,
988+
String clusterName,
989+
String pvName,
990+
String pvcName,
991+
String[] repoSecretName,
992+
String domainInHomePrefix,
993+
int replicaCount,
994+
int t3ChannelPort,
995+
Configuration configuration) {
996+
return createDomainResourceOnPv(domainUid,
997+
domNamespace,
998+
adminSecretName,
999+
clusterName,
1000+
pvName,
1001+
pvcName,
1002+
repoSecretName,
1003+
domainInHomePrefix,
1004+
replicaCount,
1005+
t3ChannelPort,
1006+
configuration,
1007+
FMWINFRA_IMAGE_TO_USE_IN_SPEC);
1008+
}
1009+
1010+
/**
1011+
* Utility to create domain resource on pv with configuration.
1012+
* @param domainUid domain uid
1013+
* @param domNamespace domain namespace
1014+
* @param adminSecretName wls admin secret name
1015+
* @param clusterName cluster name
1016+
* @param pvName PV name
1017+
* @param pvcName PVC name
1018+
* @param repoSecretName name of the secret for pulling the WebLogic image
1019+
* @param domainInHomePrefix domain in home prefix
1020+
* @param replicaCount repica count of the clsuter
1021+
* @param t3ChannelPort t3 chanel
1022+
* @param configuration domain configuratioin object
1023+
* @param imageToUse base image to use
1024+
* @return oracle.weblogic.domain.Domain object
1025+
*/
1026+
public static DomainResource createDomainResourceOnPv(String domainUid,
1027+
String domNamespace,
1028+
String adminSecretName,
1029+
String clusterName,
1030+
String pvName,
1031+
String pvcName,
1032+
String[] repoSecretName,
1033+
String domainInHomePrefix,
1034+
int replicaCount,
1035+
int t3ChannelPort,
1036+
Configuration configuration,
1037+
String imageToUse) {
9961038

9971039
// create secrets
9981040
List<V1LocalObjectReference> secrets = new ArrayList<>();
@@ -1011,7 +1053,7 @@ public static DomainResource createDomainResourceOnPv(String domainUid,
10111053
.domainUid(domainUid)
10121054
.domainHome(domainInHomePrefix + domainUid)
10131055
.domainHomeSourceType("PersistentVolume")
1014-
.image(FMWINFRA_IMAGE_TO_USE_IN_SPEC)
1056+
.image(imageToUse)
10151057
.imagePullPolicy(IMAGE_PULL_POLICY)
10161058
.webLogicCredentialsSecret(new V1LocalObjectReference()
10171059
.name(adminSecretName))

‎operator/integration-tests/domain-on-pv/build-operator.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ if [ "$(old_cksum)" = "$(latest_cksum)" ]; then
5757
exit 0
5858
fi
5959

60-
#mvn clean install -DskipTests -Dcheckstyle.skip
61-
mvn clean install
60+
mvn clean install -DskipTests -Dcheckstyle.skip
61+
#mvn clean install
6262
if [ -n "${http_proxy:-}" ]; then
6363
HTTP_BUILD_ARG="--build-arg http_proxy=$http_proxy"
6464
fi

0 commit comments

Comments
 (0)