File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed
integration-tests/src/test/java/oracle/kubernetes/operator Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change @@ -86,9 +86,9 @@ public void testDomainOnPVUsingWLST() throws Exception {
86
86
try {
87
87
domain = TestUtils .createDomain (DOMAINONPV_WLST_YAML );
88
88
domain .verifyDomainCreated ();
89
- testBasicUseCases (domain );
90
- TestUtils .renewK8sClusterLease (getProjectRoot (), getLeaseId ());
91
- testAdvancedUseCasesForADomain (operator1 , domain );
89
+ // testBasicUseCases(domain);
90
+ // TestUtils.renewK8sClusterLease(getProjectRoot(), getLeaseId());
91
+ // testAdvancedUseCasesForADomain(operator1, domain);
92
92
93
93
if (!SMOKETEST ) domain .testWlsLivenessProbe ();
94
94
@@ -232,7 +232,7 @@ public void testTwoDomainsManagedByTwoOperators() throws Exception {
232
232
233
233
/**
234
234
* Create one operator if it is not running. Create domain domain1 and domain2 dynamic cluster in
235
- * default namespace, managed by operator . Both domains sharre one PV. Verify scaling for domain2
235
+ * default namespace, managed by operator1 . Both domains share one PV. Verify scaling for domain2
236
236
* cluster from 2 to 3 servers and back to 2, plus verify no impact on domain1. Cycle domain1 down
237
237
* and back up, plus verify no impact on domain2. shutdown by the domains using the delete
238
238
* resource script from samples.
Original file line number Diff line number Diff line change @@ -877,11 +877,13 @@ protected void createPV() throws Exception {
877
877
878
878
logger .info ("pvSharing for this domain is: " + pvSharing );
879
879
if (!pvSharing ) pvMap .put ("domainUID" , domainUid );
880
+ else pvMap .put ("baseName" , "weblogic-shaing" );
881
+ logger .info ("baseName of PVPVC for this domain is: " + (String ) pvMap .get ("baseName" ));
880
882
881
- // Now there is only one pvSharing test case and we just use"baseName" as PVC
882
- if ((domainUid != null ) && !pvSharing )
883
+ // Now there is only one pvSharing test case and we just use parameter "baseName"+"-pvc " as PVC
884
+ if ((domainUid != null ) && !pvSharing ) {
883
885
domainMap .put ("persistentVolumeClaimName" , domainUid + "-" + pvMap .get ("baseName" ) + "-pvc" );
884
- else domainMap .put ("persistentVolumeClaimName" , pvMap .get ("baseName" ) + "-pvc" );
886
+ } else domainMap .put ("persistentVolumeClaimName" , pvMap .get ("baseName" ) + "-pvc" );
885
887
886
888
if (domainMap .get ("weblogicDomainStorageReclaimPolicy" ) != null ) {
887
889
pvMap .put (
You can’t perform that action at this time.
0 commit comments