Skip to content

Commit b93f257

Browse files
committed
Merge branch 'okepar' into 'main'
Split OKE internal into parallel and sequential runs See merge request weblogic-cloud/weblogic-kubernetes-operator!4590
2 parents 0bdcb6a + 645363f commit b93f257

File tree

56 files changed

+61
-58
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+61
-58
lines changed

Jenkinsfile.oke

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44

55
CRON_SETTINGS = '''H 3 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seqone;PARALLEL_RUN=false
6-
H 1 * * * % MAVEN_PROFILE_NAME=oke-sequential1;CLUSTER_NAME=seqtwo;PARALLEL_RUN=false'''
6+
H 1 * * * % MAVEN_PROFILE_NAME=oke-parallelnew;CLUSTER_NAME=parone;PARALLEL_RUN=true'''
77

88
pipeline {
99
agent { label 'large' }

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@
5656
@IntegrationTest
5757
@Tag("kind-parallel")
5858
@Tag("olcne-mrg")
59-
@Tag("oke-sequential1")
59+
@Tag("oke-gate")
60+
6061
class ItAddNewDynamicClusterUsingWlst {
6162

6263
// domain constants

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@
7171
@IntegrationTest
7272
@Tag("kind-parallel")
7373
@Tag("okd-wls-mrg")
74-
@Tag("oke-sequential1")
7574
@Tag("oke-arm")
75+
@Tag("oke-parallelnew")
7676
class ItCoherenceTests {
7777

7878
// constants for Coherence

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
@IntegrationTest
3939
@Tag("kind-parallel")
4040
@Tag("olcne-mrg")
41-
@Tag("oke-sequential1")
4241
@Tag("oke-arm")
42+
@Tag("oke-parallelnew")
4343
class ItConsensusLeasingValidation {
4444

4545
private static String opNamespace = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
@IntegrationTest
4747
@Tag("kind-parallel")
4848
@Tag("olcne-mrg")
49-
@Tag("oke-sequential1")
5049
@Tag("oke-arm")
50+
@Tag("oke-parallelnew")
5151
class ItDataHomeOverride {
5252

5353
// domain constants

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
@Tag("olcne-mrg")
6262
@Tag("kind-parallel")
6363
@Tag("okd-wls-mrg")
64-
@Tag("oke-sequential1")
6564
@Tag("oke-arm")
65+
@Tag("oke-parallelnew")
6666
class ItDiagnosticsCompleteAvailableCondition {
6767

6868
private static final String cluster1Name = "cluster-1";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
@Tag("olcne-mrg")
110110
@Tag("kind-parallel")
111111
@Tag("okd-wls-mrg")
112-
@Tag("oke-sequential1")
113112
@Tag("oke-arm")
113+
@Tag("oke-parallelnew")
114114
class ItDiagnosticsFailedCondition {
115115

116116
private static String domainNamespace = null;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@
101101
@Tag("olcne-mrg")
102102
@Tag("kind-parallel")
103103
@Tag("okd-wls-mrg")
104-
@Tag("oke-sequential1")
104+
@Tag("oke-parallelnew")
105+
105106
class ItElasticLogging {
106107

107108
// constants for creating domain image using model in image

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
@Tag("olcne-mrg")
114114
@Tag("kind-parallel")
115115
@Tag("okd-wls-mrg")
116-
@Tag("oke-sequential1")
116+
@Tag("oke-parallelnew")
117117
class ItElasticLoggingFluentd {
118118

119119
// constants for creating domain image using model in image

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@IntegrationTest
5555
@Tag("olcne-mrg")
5656
@Tag("kind-parallel")
57-
@Tag("oke-sequential1")
57+
@Tag("oke-parallelnew")
5858
class ItEvictedPodsCycling {
5959

6060
// constants for Domain

0 commit comments

Comments
 (0)