diff --git a/Jenkinsfile b/Jenkinsfile index 39c3dcc2c91..dbd5da48dad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,11 +94,12 @@ pipeline { parameters { choice(name: 'MAVEN_PROFILE_NAME', - description: 'Profile to use in mvn command to run the tests. Possible values are wls-srg (the default), integration-tests, toolkits-srg, and kind-sequential. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.', + description: 'Profile to use in mvn command to run the tests. Possible values are wls-srg (the default), integration-tests, toolkits-srg, kind-sequential and kind-upgrade. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.', choices: [ 'wls-srg', 'integration-tests', 'kind-sequential', + 'kind-upgrade', 'toolkits-srg' ] ) @@ -202,7 +203,7 @@ pipeline { defaultValue: "test-images/weblogic" ) string(name: 'WEBLOGIC_IMAGE_TAG', - description: '12.2.1.3 (12.2.1.3-ol7) , 12.2.1.3-dev (12.2.1.3-dev-ol7), 12.2.1.3-ol8, 12.2.1.3-dev-ol8, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', + description: '12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', defaultValue: '12.2.1.4' ) string(name: 'FMWINFRA_IMAGE_NAME', @@ -497,6 +498,8 @@ EOF K8S_NODEPORT_HOST=$(kubectl get node kind-worker -o jsonpath='{.status.addresses[?(@.type == "InternalIP")].address}') if [ "${MAVEN_PROFILE_NAME}" == "kind-sequential" ]; then PARALLEL_RUN='false' + elif [ "${MAVEN_PROFILE_NAME}" == "kind-upgrade" ]; then + PARALLEL_RUN='false' elif [ -n "${IT_TEST}" ]; then echo 'Overriding MAVEN_PROFILE_NAME to integration-test when running individual test(s)' MAVEN_PROFILE_NAME="integration-tests" diff --git a/Jenkinsfile.kindnightly b/Jenkinsfile.kindnightly index 9019b12a492..dfd6d61316b 100644 --- a/Jenkinsfile.kindnightly +++ b/Jenkinsfile.kindnightly @@ -61,7 +61,8 @@ def kind_k8s_map = [ ] def _kind_image = null CRON_SETTINGS = '''H 1 * * * % MAVEN_PROFILE_NAME=kind-parallel - H 2 * * * % MAVEN_PROFILE_NAME=kind-sequential;KUBE_VERSION=1.24.12;KIND_VERSION=0.18.0''' + H 2 * * * % MAVEN_PROFILE_NAME=kind-sequential + H 3 * * * % MAVEN_PROFILE_NAME=kind-upgrade;KUBE_VERSION=1.24.12;KIND_VERSION=0.18.0''' pipeline { @@ -108,10 +109,11 @@ pipeline { defaultValue: 'main' ) choice(name: 'MAVEN_PROFILE_NAME', - description: 'Profile to use in mvn command to run the tests. Possible values are kind-parallel (the default), kind-sequential and integration-tests. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.', + description: 'Profile to use in mvn command to run the tests. Possible values are kind-parallel (the default), kind-sequential, kind-upgrade,toolkits-srg, wls-srg and integration-tests. Refer to weblogic-kubernetes-operator/integration-tests/pom.xml on the branch.', choices: [ 'kind-parallel', 'kind-sequential', + 'kind-upgrade', 'integration-tests', 'toolkits-srg', 'wls-srg' @@ -221,7 +223,7 @@ pipeline { defaultValue: "test-images/weblogic" ) string(name: 'WEBLOGIC_IMAGE_TAG', - description: '12.2.1.3 (12.2.1.3-ol7) , 12.2.1.3-dev (12.2.1.3-dev-ol7), 12.2.1.3-ol8, 12.2.1.3-dev-ol8, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', + description: '12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', defaultValue: '12.2.1.4' ) string(name: 'FMWINFRA_IMAGE_NAME', @@ -523,6 +525,9 @@ EOF if [ "${MAVEN_PROFILE_NAME}" == "kind-sequential" ]; then PARALLEL_RUN='false' fi + if [ "${MAVEN_PROFILE_NAME}" == "kind-upgrade" ]; then + PARALLEL_RUN='false' + fi if [ -n "${IT_TEST}" ]; then echo "-Dit.test=\"${IT_TEST}\"" > ${WORKSPACE}/.mvn/maven.config fi diff --git a/Jenkinsfile.oke b/Jenkinsfile.oke index 6ec80c49d9e..11e033c3bb4 100644 --- a/Jenkinsfile.oke +++ b/Jenkinsfile.oke @@ -132,7 +132,7 @@ pipeline { defaultValue: 'test-images/weblogic' ) string(name: 'WEBLOGIC_IMAGE_TAG', - description: '12.2.1.3 (12.2.1.3-ol7) , 12.2.1.3-dev (12.2.1.3-dev-ol7), 12.2.1.3-ol8, 12.2.1.3-dev-ol8, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', + description: '12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', defaultValue: '12.2.1.4' ) string(name: 'FMWINFRA_IMAGE_NAME', diff --git a/Jenkinsfile.okeext b/Jenkinsfile.okeext index fe084bb3bba..cbdf860a8d4 100644 --- a/Jenkinsfile.okeext +++ b/Jenkinsfile.okeext @@ -126,7 +126,7 @@ pipeline { defaultValue: 'test-images/weblogic' ) string(name: 'WEBLOGIC_IMAGE_TAG', - description: '12.2.1.3 (12.2.1.3-ol7) , 12.2.1.3-dev (12.2.1.3-dev-ol7), 12.2.1.3-ol8, 12.2.1.3-dev-ol8, 12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', + description: '12.2.1.4, 12.2.1.4-dev(12.2.1.4-dev-ol7) , 12.2.1.4-slim(12.2.1.4-slim-ol7), 12.2.1.4-ol8, 12.2.1.4-dev-ol8, 12.2.1.4-slim-ol8, 14.1.1.0-11-ol7, 14.1.1.0-dev-11-ol7, 14.1.1.0-slim-11-ol7, 14.1.1.0-8-ol7, 14.1.1.0-dev-8-ol7, 14.1.1.0-slim-8-ol7, 14.1.1.0-11-ol8, 14.1.1.0-dev-11-ol8, 14.1.1.0-slim-11-ol8, 14.1.1.0-8-ol8, 14.1.1.0-dev-8-ol8, 14.1.1.0-slim-8-ol8', defaultValue: '12.2.1.4' ) string(name: 'FMWINFRA_IMAGE_NAME', diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 89444d885b1..c3f9d962771 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -470,6 +470,14 @@ + + kind-upgrade + + false + kind-upgrade + + + kind-parallel diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItAuxV8DomainImplicitUpgrade.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItAuxV8DomainImplicitUpgrade.java index d224429bfd3..e4263f780dd 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItAuxV8DomainImplicitUpgrade.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItAuxV8DomainImplicitUpgrade.java @@ -1,4 +1,4 @@ -// Copyright (c) 2022, Oracle and/or its affiliates. +// Copyright (c) 2022, 2023, Oracle and/or its affiliates. // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. package oracle.weblogic.kubernetes; @@ -77,8 +77,7 @@ @DisplayName("Test implicit upgrade of auximage domain resource with api version v8") @IntegrationTest -@Tag("oke-sequential") -@Tag("kind-sequential") +@Tag("kind-upgrade") class ItAuxV8DomainImplicitUpgrade { private static String opNamespace = null; private static String domainNamespace = null; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorFmwUpgrade.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorFmwUpgrade.java index b0fdb046f7e..47250f5f3b8 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorFmwUpgrade.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorFmwUpgrade.java @@ -94,7 +94,7 @@ */ @DisplayName("Tests to upgrade Operator with FMW domain in PV using WLST") @IntegrationTest -@Tag("kind-sequential") +@Tag("kind-upgrade") class ItOperatorFmwUpgrade { private static String opNamespace = null; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorUpgradeWithIstio.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorUpgradeWithIstio.java index 03d79ce20cb..6bf8877caa8 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorUpgradeWithIstio.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorUpgradeWithIstio.java @@ -70,7 +70,7 @@ */ @DisplayName("Operator upgrade tests with Istio") @IntegrationTest -@Tag("kind-sequential") +@Tag("kind-upgrade") class ItOperatorUpgradeWithIstio { private final String clusterName = "cluster-1"; // do not modify diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorWlsUpgrade.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorWlsUpgrade.java index 110dcc314eb..95bd4eb7cdf 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorWlsUpgrade.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOperatorWlsUpgrade.java @@ -119,7 +119,7 @@ @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @DisplayName("Operator upgrade tests") @IntegrationTest -@Tag("kind-sequential") +@Tag("kind-upgrade") class ItOperatorWlsUpgrade { private static LoggingFacade logger = null; @@ -198,7 +198,6 @@ void testOperatorWlsUpgradeFrom346ToCurrent(String domainType) { /** * Operator upgrade from 4.0.7 to current. */ - @Tag("oke-sequential") @ParameterizedTest @DisplayName("Upgrade Operator from 4.0.7 to current") @ValueSource(strings = { "Image", "FromModel" }) @@ -221,7 +220,6 @@ void testOperatorWlsUpgradeFrom406ToCurrent(String domainType) { /** * Operator upgrade from 4.1.0 to current. */ - @Tag("oke-sequential") @ParameterizedTest @DisplayName("Upgrade Operator from 4.1.0 to current") @ValueSource(strings = { "Image", "FromModel" })