Skip to content

Commit c5c39e5

Browse files
rjeberhardrjeberhard
committed
Merge branch 'oke42weekly' into 'release/4.2'
moved to weekly execution tests tagged with oke-weekly See merge request weblogic-cloud/weblogic-kubernetes-operator!4820
2 parents f11a024 + 80ba117 commit c5c39e5

30 files changed

+125
-40
lines changed

‎Jenkinsfile.oke

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
//
44

55

6-
CRON_SETTINGS_MAIN = '''H 3 * * 1-5 % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seqone;PARALLEL_RUN=false
7-
H 2 * * 1-5 % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=parone;PARALLEL_RUN=true'''
8-
CRON_SETTINGS_42 = '''H 1 * * 1-5 % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seq42one;PARALLEL_RUN=false
9-
H 11 * * 1-5 % MAVEN_PROFILE_NAME=oke-sequential;CLUSTER_NAME=seq42two;PARALLEL_RUN=false
10-
H 14 * * 1-5 % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=par42one;PARALLEL_RUN=true'''
6+
CRON_SETTINGS_MAIN = '''H 3 * * 0-4 % MAVEN_PROFILE_NAME=oke-weekly-sequential;CLUSTER_NAME=seqweekly;PARALLEL_RUN=false
7+
H 2 * * 0-4 % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=parone;PARALLEL_RUN=true'''
8+
CRON_SETTINGS_42 = '''H 1 * * 5 % MAVEN_PROFILE_NAME=oke-weekly-sequential;CLUSTER_NAME=seq42weekly;PARALLEL_RUN=false
9+
H 23 * * 0-4 % MAVEN_PROFILE_NAME=oke-sequential;CLUSTER_NAME=seq42two;PARALLEL_RUN=false
10+
H 18 * * 0-4 % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=par42one;PARALLEL_RUN=true'''
1111

1212

1313

@@ -117,9 +117,9 @@ pipeline {
117117
)
118118

119119
choice(name: 'MAVEN_PROFILE_NAME',
120-
description: 'Profile to use in mvn command to run the tests. Possible values are oke-gate,oke-parallel, oke-sequential. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
120+
description: 'Profile to use in mvn command to run the tests. Possible values are oke-weekly-sequential,oke-parallel, oke-sequential. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
121121
choices: [
122-
'oke-gate',
122+
'oke-weekly-sequential',
123123
'oke-sequential',
124124
'oke-parallel'
125125
]
@@ -633,6 +633,8 @@ EOF
633633
export TEST_IMAGES_REPO_USERNAME="${OCIR_USER}"
634634
export TEST_IMAGES_REPO_PASSWORD="${OCIR_PASS}"
635635
export TEST_IMAGES_REPO_EMAIL="[email protected]"
636+
export no_proxy="${NO_PROXY},localhost,127.0.0.1,.us.oracle.com,.oraclecorp.com,login.oracle.com"
637+
export NO_PROXY="${no_proxy}"
636638

637639
if ! mvn -pl integration-tests -P ${MAVEN_PROFILE_NAME} verify 2>&1 | tee "${result_root}/oketest.log"; then
638640
echo "integration-tests failed"
@@ -677,7 +679,7 @@ EOF
677679
${WORKSPACE}/terraform/oke.delete.sh ${OCI_PROP_FILE} ${WORKSPACE}/terraform ${AVAILABILITY_DOMAIN}
678680
fi
679681

680-
if [ "${MAVEN_PROFILE_NAME}" = "oke-gate" ] && [ "${BRANCH}" = "release/4.2" ]; then
682+
if [ "${MAVEN_PROFILE_NAME}" = "oke-sequential" ] && [ "${BRANCH}" = "release/4.2" ]; then
681683
compname="wkt"
682684
wkt_compartment_ocid=$(oci iam compartment list --compartment-id-in-subtree true --all | jq --arg compname "$compname" '.data[] | select(."name"==$compname)' | jq -r ."id")
683685
sec_list_id=$(oci network security-list list --compartment-id="$wkt_compartment_ocid" --display-name=Security-List-wktiso1 | jq -r '.data[] | ."id"')

‎Jenkinsfile.podman

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ def kind_k8s_map = [
1818
]
1919
]
2020
def _kind_image = null
21-
CRON_SETTINGS = '''H 1 * * 1-5 % MAVEN_PROFILE_NAME=kind-parallel
22-
H 2 * * 1-5 % MAVEN_PROFILE_NAME=kind-sequential'''
21+
CRON_SETTINGS = '''H 1 * * 0-4 % MAVEN_PROFILE_NAME=kind-parallel
22+
H 2 * * 0-4 % MAVEN_PROFILE_NAME=kind-sequential'''
2323

2424
pipeline {
2525
agent { label 'large-ol9u4' }

‎Jenkinsfile.podman.upgrade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def kind_k8s_map = [
2020
]
2121
]
2222
def _kind_image = null
23-
CRON_SETTINGS = '''H 4 * * * % MAVEN_PROFILE_NAME=kind-upgrade;KUBE_VERSION=1.24.17'''
23+
CRON_SETTINGS = '''H 4 * * 0-4 % MAVEN_PROFILE_NAME=kind-upgrade;KUBE_VERSION=1.24.17'''
2424

2525
pipeline {
2626
agent { label 'large-ol9u4' }

‎integration-tests/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,10 @@
469469
</profile>
470470

471471
<profile>
472-
<id>oke-gate</id>
472+
<id>oke-weekly-sequential</id>
473473
<properties>
474474
<skipITs>false</skipITs>
475-
<groups>oke-gate</groups>
475+
<groups>oke-weekly-sequential</groups>
476476
</properties>
477477
</profile>
478478
<profile>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
@DisplayName("Verify the overrideDistributionStrategy applies the overrides accordingly to the value set")
137137
@Tag("kind-parallel")
138138
@Tag("okd-wls-mrg")
139-
@Tag("oke-gate")
139+
@Tag("oke-weekly-sequential")
140140
@IntegrationTest
141141
@Tag("olcne-mrg")
142142
class ItConfigDistributionStrategy {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ private static void createNginxIngressPathRoutingRules() {
699699
//restart core-dns service
700700
result = ExecCommand.exec(KUBERNETES_CLI + " rollout restart deployment coredns -n kube-system");
701701
logger.info(result.stdout());
702-
checkPodReady("core-dns", null, "kube-system");
702+
checkPodReady("coredns", null, "kube-system");
703703
result = ExecCommand.exec(curlCmd);
704704
logger.info(result.stdout());
705705
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
@DisplayName("Verify cross domain transaction is successful with CrossDomainSecurityEnabled set to true")
100100
@IntegrationTest
101101
@Tag("kind-parallel")
102-
@Tag("oke-gate")
102+
@Tag("oke-weekly-sequential")
103103
class ItCrossDomainTransactionSecurity {
104104

105105
private static final String auxImageName1 = DOMAIN_IMAGES_PREFIX + "domain1-cdxaction-aux";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
@DisplayName("Test to create FMW model in image domain and WebLogic domain using Oracle "
110110
+ "database created using Oracle Database Operator")
111111
@IntegrationTest
112-
@Tag("oke-gate")
112+
@Tag("oke-weekly-sequential")
113113
@Tag("kind-parallel")
114114
class ItDBOperator {
115115

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
*/
6969
@DisplayName("Test Operator and WebLogic domain with Dedicated set to true")
7070
@Tag("kind-sequential")
71-
@Tag("oke-gate")
71+
@Tag("oke-weekly-sequential")
7272
@Tag("okd-wls-mrg")
7373
@IntegrationTest
7474
class ItDedicatedMode {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
*/
6363
@DisplayName("Test to creat a FMW domain in persistent volume using WDT")
6464
@IntegrationTest
65-
@Tag("oke-gate")
65+
@Tag("oke-weekly-sequential")
6666
@Tag("kind-sequential")
6767
@Tag("okd-fmw-cert")
6868
class ItFmwDomainInPVUsingWDT {

0 commit comments

Comments
 (0)