Skip to content

Commit f8d6ca5

Browse files
xiancaoxiancao
committed
Merge branch 'main' of https://github.com/oracle/weblogic-kubernetes-operator into xc-91861
2 parents fa716d3 + a980e4a commit f8d6ca5

File tree

8 files changed

+198
-236
lines changed

8 files changed

+198
-236
lines changed

‎integration-tests/pom.xml

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -214,42 +214,35 @@
214214
<properties>
215215
<skipITs>false</skipITs>
216216
<includes-failsafe>
217-
**/ItCoherenceTests,
217+
**/ItExternalLbTunneling,
218+
**/ItMiiAuxiliaryImage,
219+
**/ItMiiAuxiliaryImageCluster,
220+
**/ItMiiSampleWlsAux,
221+
**/ItMiiCustomSslStore,
222+
**/ItMiiServiceMigration,
223+
**/ItRemoteConsole,
218224
**/ItConfigDistributionStrategy,
219225
**/ItCrossDomainTransaction,
220226
**/ItElasticLogging,
221227
**/ItElasticLoggingFluentd,
222228
**/ItExternalRmiTunneling,
223-
**/ItInitContainers,
224229
**/ItIntrospectVersion,
225-
**/ItIstioCrossDomainTransaction,
226-
**/ItIstioDomainInImage,
230+
**/ItCrossDomainTransaction,
227231
**/ItIstioDomainInPV,
228232
**/ItIstioMiiDomain,
229-
**/ItIstioTwoDomainsInImage,
230-
**/ItKubernetesEvents,
231-
**/ItManageNameSpace,
232233
**/ItManagedCoherence,
233234
**/ItMiiDomain,
234-
**/ItMiiDomainModelInPV,
235235
**/ItMiiDynamicUpdate,
236-
**/ItMiiMultiModel,
237-
**/ItMiiSample,
236+
**/ItMiiSampleWlsMain,
238237
**/ItMiiUpdateDomainConfig,
239238
**/ItMonitoringExporter,
240-
**/ItOperatorRestart,
241239
**/ItParameterizedDomain,
242-
**/ItPodTemplates,
243-
**/ItPodsRestart,
244240
**/ItPodsShutdownOption,
245241
**/ItProductionSecureMode,
246242
**/ItWlsSamples,
247-
**/ItServerStartPolicy,
248243
**/ItSessionMigration,
249244
**/ItStickySession,
250-
**/ItSystemResOverrides,
251-
**/ItTwoDomainsLoadBalancer,
252-
**/ItUsabilityOperatorHelmChart
245+
**/ItSystemResOverrides
253246
</includes-failsafe>
254247
</properties>
255248
</profile>
@@ -309,39 +302,28 @@
309302
<properties>
310303
<skipITs>false</skipITs>
311304
<includes-failsafe>
312-
**/ItCoherenceTests,
313305
**/ItConfigDistributionStrategy,
314306
**/ItCrossDomainTransaction,
315307
**/ItElasticLogging,
316308
**/ItElasticLoggingFluentd,
317-
**/ItExternalRmiTunneling,
318-
**/ItInitContainers,
319309
**/ItIntrospectVersion,
320-
**/ItIstioCrossDomainTransaction,
321-
**/ItIstioDomainInImage,
322310
**/ItIstioDomainInPV,
323311
**/ItIstioMiiDomain,
324-
**/ItIstioTwoDomainsInImage,
325-
**/ItKubernetesEvents,
326-
**/ItManageNameSpace,
312+
**/ItMiiAuxiliaryImage,
313+
**/ItMiiAuxiliaryImageCluster,
314+
**/ItMiiSampleWlsAux,
315+
**/ItMiiServiceMigration,
327316
**/ItMiiDomain,
328-
**/ItMiiDomainModelInPV,
329317
**/ItMiiDynamicUpdate,
330-
**/ItMiiMultiModel,
331-
**/ItMiiSample,
318+
**/ItMiiSampleWlsMain,
332319
**/ItMiiUpdateDomainConfig,
333320
**/ItMonitoringExporter,
334-
**/ItOperatorRestart,
335321
**/ItParameterizedDomain,
336-
**/ItPodTemplates,
337-
**/ItPodsRestart,
338322
**/ItPodsShutdownOption,
339323
**/ItProductionSecureMode,
340324
**/ItWlsSamples,
341-
**/ItServerStartPolicy,
342325
**/ItSessionMigration,
343-
**/ItSystemResOverrides,
344-
**/ItUsabilityOperatorHelmChart
326+
**/ItSystemResOverrides
345327
</includes-failsafe>
346328
</properties>
347329
</profile>

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImage.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
4545
import static oracle.weblogic.kubernetes.TestConstants.WDT_TEST_VERSION;
4646
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
47-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
47+
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
4848
import static oracle.weblogic.kubernetes.actions.ActionConstants.ARCHIVE_DIR;
4949
import static oracle.weblogic.kubernetes.actions.ActionConstants.DOWNLOAD_DIR;
5050
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
@@ -268,7 +268,7 @@ void testCreateDomainUsingMultipleAuxiliaryImages() {
268268
logger.info("Creating domain custom resource with domainUid {0} and auxiliary images {1} {2}",
269269
domainUid, miiAuxiliaryImage1, miiAuxiliaryImage2);
270270
Domain domainCR = createDomainResource(domainUid, domainNamespace,
271-
WEBLOGIC_IMAGE_NAME + ":" + WEBLOGIC_IMAGE_TAG, adminSecretName, OCIR_SECRET_NAME,
271+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, OCIR_SECRET_NAME,
272272
encryptionSecretName, replicaCount, "cluster-1", auxiliaryImagePath,
273273
auxiliaryImageVolumeName, miiAuxiliaryImage1, miiAuxiliaryImage2);
274274

@@ -461,7 +461,7 @@ void testErrorPathDomainMismatchMountPath() {
461461
logger.info("Creating domain custom resource with domainUid {0} and auxiliary image {1}",
462462
domainUid, errorPathAuxiliaryImage1);
463463
Domain domainCR = createDomainResource(domainUid, errorpathDomainNamespace,
464-
WEBLOGIC_IMAGE_NAME + ":" + WEBLOGIC_IMAGE_TAG, adminSecretName, OCIR_SECRET_NAME,
464+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, OCIR_SECRET_NAME,
465465
encryptionSecretName, replicaCount, "cluster-1", auxiliaryImagePath,
466466
auxiliaryImageVolumeName, errorPathAuxiliaryImage1);
467467

@@ -541,7 +541,7 @@ void testErrorPathDomainMissingWDTBinary() {
541541
logger.info("Creating domain custom resource with domainUid {0} and auxiliary image {1}",
542542
domainUid, errorPathAuxiliaryImage2);
543543
Domain domainCR = createDomainResource(domainUid, errorpathDomainNamespace,
544-
WEBLOGIC_IMAGE_NAME + ":" + WEBLOGIC_IMAGE_TAG, adminSecretName, OCIR_SECRET_NAME,
544+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, OCIR_SECRET_NAME,
545545
encryptionSecretName, replicaCount, "cluster-1", auxiliaryImagePath,
546546
auxiliaryImageVolumeName, errorPathAuxiliaryImage2);
547547

@@ -628,7 +628,7 @@ void testErrorPathDomainMissingDomainConfig() {
628628
logger.info("Creating domain custom resource with domainUid {0} and auxiliary image {1}",
629629
domainUid, errorPathAuxiliaryImage3);
630630
Domain domainCR = createDomainResource(domainUid, errorpathDomainNamespace,
631-
WEBLOGIC_IMAGE_NAME + ":" + WEBLOGIC_IMAGE_TAG, adminSecretName, OCIR_SECRET_NAME,
631+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, OCIR_SECRET_NAME,
632632
encryptionSecretName, replicaCount, "cluster-1", auxiliaryImagePath,
633633
auxiliaryImageVolumeName, errorPathAuxiliaryImage3);
634634

@@ -823,7 +823,7 @@ void testErrorPathFilePermission() {
823823
logger.info("Creating domain custom resource with domainUid {0} and auxiliary image {1}",
824824
domainUid, errorPathAuxiliaryImage4);
825825
Domain domainCR = createDomainResource(domainUid, errorpathDomainNamespace,
826-
WEBLOGIC_IMAGE_NAME + ":" + WEBLOGIC_IMAGE_TAG, adminSecretName, OCIR_SECRET_NAME,
826+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, OCIR_SECRET_NAME,
827827
encryptionSecretName, replicaCount, "cluster-1", auxiliaryImagePath,
828828
auxiliaryImageVolumeName, errorPathAuxiliaryImage4);
829829

@@ -985,7 +985,7 @@ void testUpdateWDTVersionUsingMultipleAuxiliaryImages() {
985985
logger.info("Creating domain custom resource with domainUid {0} and auxiliary images {1} {2}",
986986
domainUid, miiAuxiliaryImage4, miiAuxiliaryImage5);
987987
Domain domainCR = createDomainResource(domainUid, wdtDomainNamespace,
988-
WEBLOGIC_IMAGE_NAME + ":" + WEBLOGIC_IMAGE_TAG, adminSecretName, OCIR_SECRET_NAME,
988+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, OCIR_SECRET_NAME,
989989
encryptionSecretName, replicaCount, "cluster-1", auxiliaryImagePath,
990990
auxiliaryImageVolumeName, miiAuxiliaryImage4, miiAuxiliaryImage5);
991991

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiAuxiliaryImageCluster.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
import static oracle.weblogic.kubernetes.TestConstants.MII_BASIC_IMAGE_TAG;
3333
import static oracle.weblogic.kubernetes.TestConstants.OCIR_SECRET_NAME;
3434
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
35-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_NAME;
36-
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TAG;
35+
import static oracle.weblogic.kubernetes.TestConstants.WEBLOGIC_IMAGE_TO_USE_IN_SPEC;
3736
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
3837
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
3938
import static oracle.weblogic.kubernetes.actions.TestActions.dockerPush;
@@ -178,7 +177,7 @@ void testCreateDomainUsingAuxiliaryImagesWClusterConfig() {
178177
logger.info("Creating domain custom resource with domainUid {0} and auxiliary images {1} {2}",
179178
domainUid, auxiliaryImageDomainScopeNames.toString(), auxiliaryImageClusterScopeNames.toString());
180179
Domain domainCR = createDomainResourceWithAuxiliaryImageClusterScope(domainUid, domainNamespace,
181-
WEBLOGIC_IMAGE_NAME + ":" + WEBLOGIC_IMAGE_TAG, adminSecretName, OCIR_SECRET_NAME,
180+
WEBLOGIC_IMAGE_TO_USE_IN_SPEC, adminSecretName, OCIR_SECRET_NAME,
182181
encryptionSecretName, replicaCount, clusterName,
183182
Map.of(auxiliaryImagePath, List.of(auxiliaryImageVolumeName)),
184183
auxiliaryImageDomainScopeNames, auxiliaryImageClusterScopeNames);

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorFmwUpgrade.java

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.junit.jupiter.api.AfterEach;
4040
import org.junit.jupiter.api.BeforeAll;
4141
import org.junit.jupiter.api.BeforeEach;
42-
import org.junit.jupiter.api.Disabled;
4342
import org.junit.jupiter.api.DisplayName;
4443
import org.junit.jupiter.api.Test;
4544

@@ -201,29 +200,6 @@ public void tearDown() {
201200
}
202201
}
203202

204-
/**
205-
* Operator upgrade from 2.6.0 to latest with a FMW Domain.
206-
* Delete Operator and install latest Operator.
207-
* Verify Domain resource version is updated while domain is in running state.
208-
*/
209-
@Test
210-
@Disabled("Disable FMW upgrade usecase from version 2.6.0")
211-
@DisplayName("Upgrade Operator from 2.6.0 to main")
212-
void testOperatorFmwUpgradeFrom260ToMain() {
213-
installAndUpgradeOperator("2.6.0", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, false);
214-
}
215-
216-
/**
217-
* Operator upgrade from 3.0.3 to latest with a FMW Domain.
218-
*/
219-
@Test
220-
@Disabled("Disable FMW upgrade usecase from version 3.0.3")
221-
@DisplayName("Upgrade Operator from 3.0.3 to main")
222-
void testOperatorFmwUpgradeFrom303ToMain() {
223-
this.namespaces = namespaces;
224-
installAndUpgradeOperator("3.0.3", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
225-
}
226-
227203
/**
228204
* Operator upgrade from 3.0.4 to latest with a FMW Domain.
229205
*/
@@ -234,16 +210,6 @@ void testOperatorFmwUpgradeFrom304ToMain() {
234210
installAndUpgradeOperator("3.0.4", OLD_DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
235211
}
236212

237-
/**
238-
* Operator upgrade from 3.1.3 to latest with a FMW Domain.
239-
*/
240-
@Test
241-
@Disabled("Disable FMW upgrade usecase from version 3.1.3")
242-
@DisplayName("Upgrade Operator from 3.1.3 to main")
243-
void testOperatorFmwUpgradeFrom313ToMain() {
244-
installAndUpgradeOperator("3.1.3", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
245-
}
246-
247213
/**
248214
* Operator upgrade from 3.1.4 to latest with a FMW Domain.
249215
*/
@@ -253,26 +219,6 @@ void testOperatorFmwUpgradeFrom314ToMain() {
253219
installAndUpgradeOperator("3.1.4", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
254220
}
255221

256-
/**
257-
* Operator upgrade from 3.2.0 to latest with a FMW Domain.
258-
*/
259-
@Test
260-
@Disabled("Disable FMW upgrade usecase from version 3.2.0")
261-
@DisplayName("Upgrade Operator from 3.2.0 to main")
262-
void testOperatorFmwUpgradeFrom320ToMain() {
263-
installAndUpgradeOperator("3.2.0", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
264-
}
265-
266-
/**
267-
* Operator upgrade from 3.2.4 to latest with a FMW Domain.
268-
*/
269-
@Test
270-
@Disabled("Disable FMW upgrade usecase from version 3.2.4")
271-
@DisplayName("Upgrade Operator from 3.2.4 to main")
272-
void testOperatorFmwUpgradeFrom324ToMain() {
273-
installAndUpgradeOperator("3.2.4", DEFAULT_EXTERNAL_SERVICE_NAME_SUFFIX, true);
274-
}
275-
276222
/**
277223
* Operator upgrade from 3.2.5 to latest with a FMW Domain.
278224
*/

0 commit comments

Comments
 (0)