Skip to content

Commit 834babb

Browse files
committed
Merge branch 'owls121126' into 'release/4.2'
Adding upgrade tests covering ServerStartMode prod and secure See merge request weblogic-cloud/weblogic-kubernetes-operator!4810
2 parents dd058ab + 422ede3 commit 834babb

File tree

6 files changed

+528
-30
lines changed

6 files changed

+528
-30
lines changed

Jenkinsfile.oke

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33
//
44

5-
CRON_SETTINGS_MAIN = '''H 3 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seqone;PARALLEL_RUN=false
6-
H 2 * * * % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=parone;PARALLEL_RUN=true'''
7-
8-
CRON_SETTINGS_42 = '''H 1 * * * % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seq42one;PARALLEL_RUN=false
9-
H 11 * * * % MAVEN_PROFILE_NAME=oke-sequential;CLUSTER_NAME=seq42two;PARALLEL_RUN=false
10-
H 14 * * * % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=par42one;PARALLEL_RUN=true'''
5+
CRON_SETTINGS_MAIN = '''H 3 * * 1-5 % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seqone;PARALLEL_RUN=false
6+
H 2 * * 1-5 % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=parone;PARALLEL_RUN=true'''
7+
CRON_SETTINGS_42 = '''H 1 * * 1-5 % MAVEN_PROFILE_NAME=oke-gate;CLUSTER_NAME=seq42one;PARALLEL_RUN=false
8+
H 11 * * 1-5 % MAVEN_PROFILE_NAME=oke-sequential;CLUSTER_NAME=seq42two;PARALLEL_RUN=false
9+
H 14 * * 1-5 % MAVEN_PROFILE_NAME=oke-parallel;CLUSTER_NAME=par42one;PARALLEL_RUN=true'''
1110

1211
CRON_SETTINGS = "${env.JOB_NAME == 'wko-oke-nightly' ? CRON_SETTINGS_MAIN : CRON_SETTINGS_42}"
1312

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 * * * % MAVEN_PROFILE_NAME=kind-parallel
22-
H 2 * * * % MAVEN_PROFILE_NAME=kind-sequential'''
21+
CRON_SETTINGS = '''H 1 * * 1-5 % MAVEN_PROFILE_NAME=kind-parallel
22+
H 2 * * 1-5 % MAVEN_PROFILE_NAME=kind-sequential'''
2323

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
156156
*/
157157
@Test
158158
@DisplayName("Test custom liveness probe is triggered")
159-
@Tag("gate")
160159
@Tag("crio")
161160
void testCustomLivenessProbeTriggered() {
162161
DomainResource domain1 = assertDoesNotThrow(() -> getDomainCustomResource(domainUid, domainNamespace),

0 commit comments

Comments
 (0)