Skip to content

Commit b53bed2

Browse files
committed
Merge branch 'oketest42' into 'release/4.2'
Split OKE sequential run into 2 to decrease execution time See merge request weblogic-cloud/weblogic-kubernetes-operator!4807
2 parents bdd1710 + 2aeda7c commit b53bed2

11 files changed

+13
-11
lines changed

Jenkinsfile.oke

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ CRON_SETTINGS_MAIN = '''H 3 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seq
66
H 2 * * * % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=parone;PARALLEL_RUN=true'''
77

88
CRON_SETTINGS_42 = '''H 3 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seq42one;PARALLEL_RUN=false
9+
H 1 * * * % MAVEN_PROFILE_NAME=oke-sequential;CLUSTER_NAME=seq42two;PARALLEL_RUN=false
910
H 2 * * * % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=par42one;PARALLEL_RUN=true'''
1011

1112
CRON_SETTINGS = "${env.JOB_NAME == 'wko-oke-nightly' ? CRON_SETTINGS_MAIN : CRON_SETTINGS_42}"
@@ -114,9 +115,10 @@ pipeline {
114115
)
115116

116117
choice(name: 'MAVEN_PROFILE_NAME',
117-
description: 'Profile to use in mvn command to run the tests. Possible values are oke-gate,oke-parallel. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.',
118+
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.',
118119
choices: [
119120
'oke-gate',
121+
'oke-sequential',
120122
'oke-parallel'
121123
]
122124
)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
*/
113113
@DisplayName("Verify cross domain transaction is successful")
114114
@IntegrationTest
115-
@Tag("oke-gate")
115+
@Tag("oke-sequential")
116116
@Tag("kind-parallel")
117117
@Tag("okd-wls-srg")
118118
class ItCrossDomainTransaction {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
@DisplayName("Test to create a FMW domain in persistent volume with new simplified feature")
9696
@IntegrationTest
9797
@Tag("kind-sequential")
98-
@Tag("oke-gate")
98+
@Tag("oke-sequential")
9999
@Tag("okd-fmw-cert")
100100
class ItFmwDomainOnPV {
101101

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
@Tag("olcne-srg")
176176
@Tag("kind-parallel")
177177
@Tag("okd-wls-mrg")
178-
@Tag("oke-gate")
178+
@Tag("oke-sequential")
179179
@Tag("oke-arm")
180180
class ItIntrospectVersion {
181181

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@
150150
@Tag("oke-arm")
151151
@IntegrationTest
152152
@Tag("olcne-srg")
153-
@Tag("oke-gate")
153+
@Tag("oke-sequential")
154154
class ItKubernetesDomainEvents {
155155

156156
private static String opNamespace = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
@Tag("kind-parallel")
105105
@Tag("okd-wls-srg")
106106
@Tag("oke-arm")
107-
@Tag("oke-gate")
107+
@Tag("oke-sequential")
108108
class ItMiiClusterResource {
109109

110110
private static String opNamespace = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
@Tag("kind-parallel")
6767
@Tag("toolkits-srg")
6868
@Tag("okd-wls-mrg")
69-
@Tag("oke-gate")
69+
@Tag("oke-sequential")
7070
@Tag("oke-arm")
7171
@Tag("olcne-srg")
7272
class ItMiiDynamicUpdatePart1 {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
@Tag("kind-parallel")
6666
@Tag("toolkits-srg")
6767
@Tag("okd-wls-mrg")
68-
@Tag("oke-gate")
68+
@Tag("oke-sequential")
6969
@Tag("oke-arm")
7070
class ItMiiDynamicUpdatePart2 {
7171

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
@DisplayName("Test dynamic updates to a model in image domain, part3")
7878
@IntegrationTest
7979
@Tag("olcne-mrg")
80-
@Tag("oke-gate")
80+
@Tag("oke-sequential")
8181
@Tag("kind-parallel")
8282
@Tag("toolkits-srg")
8383
@Tag("okd-wls-mrg")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
@Tag("kind-parallel")
120120
@Tag("toolkits-srg")
121121
@Tag("okd-wls-srg")
122-
@Tag("oke-gate")
122+
@Tag("oke-sequential")
123123
class ItMiiUpdateDomainConfig {
124124

125125
private static String opNamespace = null;

0 commit comments

Comments
 (0)