Skip to content

Commit 32603a4

Browse files
committed
Merge branch 'domainpvport' into 'release/4.1'
backport domainonpv in oke See merge request weblogic-cloud/weblogic-kubernetes-operator!4495
2 parents 3a3b413 + f64d699 commit 32603a4

23 files changed

+1794
-325
lines changed

Jenkinsfile.oke

Lines changed: 352 additions & 317 deletions
Large diffs are not rendered by default.

Jenkinsfile.okeext

Lines changed: 615 additions & 0 deletions
Large diffs are not rendered by default.

integration-tests/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,13 @@
444444
<groups>oke-sequential</groups>
445445
</properties>
446446
</profile>
447+
<profile>
448+
<id>oke-gate</id>
449+
<properties>
450+
<skipITs>false</skipITs>
451+
<groups>oke-gate</groups>
452+
</properties>
453+
</profile>
447454

448455
<profile>
449456
<id>oke-parallel</id>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
@DisplayName("Test for initializeDomainOnPV when user per-creates RCU")
9999
@IntegrationTest
100100
@Tag("kind-sequential")
101-
@Tag("oke-gate")
101+
@Tag("oke-sequential")
102102
public class ItFmwDomainInPvUserCreateRcu {
103103

104104
private static String opNamespace = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
@DisplayName("Test to create a FMW domain in persistent volume with new simplified feature")
9191
@IntegrationTest
9292
@Tag("kind-parallel")
93-
@Tag("oke-gate")
93+
@Tag("oke-sequential")
9494
@Tag("okd-fmw-cert")
9595
class ItFmwDomainOnPV {
9696

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
@DisplayName("Test to create a WLS domain in persistent volume with new simplified feature")
6363
@IntegrationTest
6464
@Tag("kind-parallel")
65-
@Tag("oke-gate")
65+
@Tag("oke-sequential")
6666
class ItWlsDomainOnPV {
6767

6868
private static String domainNamespace = null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,8 +1259,8 @@ public static void createJobToChangePermissionsOnPvHostPath(String pvName, Strin
12591259
fail("Change permissions on PV hostpath job failed");
12601260
}
12611261
}
1262+
assertDoesNotThrow(() -> deleteJob(jobName, namespace));
12621263
}
1263-
assertDoesNotThrow(() -> deleteJob(jobName, namespace));
12641264
}
12651265
}
12661266

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -507,5 +507,4 @@ public static void changePermissionOnPv(String namespace, String pvName, String
507507
pvcName, namespace,
508508
mountPath, argCommand);
509509
}
510-
511510
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
apiVersion: storage.k8s.io/v1
4+
kind: CSIDriver
5+
metadata:
6+
name: fss.csi.oraclecloud.com
7+
spec:
8+
attachRequired: false
9+
fsGroupPolicy: File
10+
podInfoOnMount: false
11+
requiresRepublish: false
12+
storageCapacity: false
13+
volumeLifecycleModes:
14+
- Persistent
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Copyright (c) 2023, Oracle and/or its affiliates.
2+
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
3+
kind: StorageClass
4+
apiVersion: storage.k8s.io/v1
5+
metadata:
6+
name: oci-fss
7+
provisioner: fss.csi.oraclecloud.com
8+
parameters:
9+
# Insert mount target from the FSS here
10+
availabilityDomain: %AVAILABILITY_DOMAIN%
11+
mountTargetOcid: %MOUNT_TARGET_ID%

0 commit comments

Comments
 (0)