diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml index e747d5ae78dee..c8930e7818456 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-master.yaml @@ -135,7 +135,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestGatewayConformance|TestGateway/managed-owner|TestCNIVersionSkew|TestGateway|TestPilotResourceFilter TEST_FILE_NAME: junit.xml TEST_SUITE: pilot TEST_SUITE_DESC: Istio Integration pilot @@ -188,7 +187,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestTrafficWithCNIUpgrade|TestCNIMisconfigHealsOnRestart|TestGatewayConformance|TestAPIServer|TestTCPRoute|TestTLSRoute|TestWaypointAsEgressGateway/http_origination_targetPort_with_BackendTLSPolicy|TestWaypointAsEgressGateway/http_origination_route_with_BackendTLSPolicy TEST_FILE_NAME: junit.xml TEST_SUITE: ambient TEST_SUITE_DESC: Istio Integration ambient @@ -206,7 +204,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestAmbientInstall|TestAmbientInstallMultiNamespace|TestCanaryUpgradeFromTwoMinorRelease|TestAmbientStableRevisionLabelsGatewayStatus|TestStableRevisionLabelsUpgradeFromPreviousMinorRelease|TestStableRevisionLabelsUpgradeFromTwoMinorRelease|TestAmbientInPlaceUpgradeFromPreviousMinorRelease|TestZtunnelFromPreviousMinorRelease TEST_FILE_NAME: junit.xml TEST_SUITE: helm TEST_SUITE_DESC: Istio Integration helm @@ -226,7 +223,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestGatewayConformance|TestGateway/managed-owner|TestCNIVersionSkew|TestGateway|TestAuthZCheck|TestKubeInject|TestRevisionTags|TestUninstallByRevision|TestUninstallWithSetFlag|TestUninstallCustomFile|TestUninstallPurge|TestCNIRaceRepair|TestValidation|TestWebhook|TestMultiRevision|TestAnalysisWritesStatus|TestLocality|TestPreserveHTTPHeaderCaseConfiguration|TestPilotResourceFilter TEST_FILE_NAME: junit.xml TEST_SUITE: pilot TEST_SUITE_DESC: Istio Integration pilot @@ -246,7 +242,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestDashboard/pilot-dashboard.json TEST_FILE_NAME: junit.xml TEST_SUITE: telemetry TEST_SUITE_DESC: Istio Integration telemetry @@ -266,8 +261,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_SUITES: external_ca|file_mounted_certs|policy_attachment_only - SKIPPED_TESTS: TestAuthz_CustomServer|TestGatewayAPIRequestAuthentication|TestNormalization|TestAuthz_MultipleCustomProviders_NonOverlapping|TestAuthz_MultipleCustomProviders_Overlapping TEST_FILE_NAME: junit.xml TEST_SUITE: security TEST_SUITE_DESC: Istio Integration security @@ -288,7 +281,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestTrafficWithCNIUpgrade|TestCNIMisconfigHealsOnRestart|TestGatewayConformance|TestAPIServer|TestTrafficWithEstablishedPodsIfCNIMissing|TestTaintsRemoved|TestTrafficWithCNIRepair|TestTCPRoute|TestTLSRoute|TestWaypointChanges|TestZtunnelSecureMetrics|TestWaypointAsEgressGateway/http_origination_targetPort_with_BackendTLSPolicy|TestWaypointAsEgressGateway/http_origination_route_with_BackendTLSPolicy|TestZtunnelCRL TEST_FILE_NAME: junit.xml TEST_SUITE: ambient TEST_SUITE_DESC: Istio Integration ambient diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml index e539fa5c96d22..ffff298242dc7 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.24.yaml @@ -98,7 +98,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestAmbientInstall|TestAmbientInstallMultiNamespace|TestCanaryUpgradeFromTwoMinorRelease|TestStableRevisionLabelsUpgradeFromPreviousMinorRelease|TestStableRevisionLabelsUpgradeFromTwoMinorRelease|TestAmbientInPlaceUpgradeFromPreviousMinorRelease|TestZtunnelFromPreviousMinorRelease|TestDefaultInPlaceUpgradeFromPreviousMinorRelease|TestCanaryUpgradeFromPreviousMinorRelease TEST_FILE_NAME: junit.xml TEST_SUITE: helm TEST_SUITE_DESC: Istio Integration helm @@ -117,7 +116,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestMultiTlsGateway_InvalidSecret|TestMultiMtlsGateway_InvalidSecret TEST_FILE_NAME: junit.xml TEST_SUITE: security TEST_SUITE_DESC: Istio Integration security @@ -135,7 +133,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestGatewayConformance|TestGateway/managed-owner|TestCNIVersionSkew|TestGateway TEST_FILE_NAME: junit.xml TEST_SUITE: pilot TEST_SUITE_DESC: Istio Integration pilot diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.26.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.26.yaml index ff7c35d34f564..74e4b52882f19 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.26.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.26.yaml @@ -110,7 +110,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestAmbientInstall|TestAmbientInstallMultiNamespace|TestCanaryUpgradeFromTwoMinorRelease|TestStableRevisionLabelsUpgradeFromPreviousMinorRelease|TestStableRevisionLabelsUpgradeFromTwoMinorRelease|TestAmbientInPlaceUpgradeFromPreviousMinorRelease|TestZtunnelFromPreviousMinorRelease TEST_FILE_NAME: junit.xml TEST_SUITE: helm TEST_SUITE_DESC: Istio Integration helm @@ -146,7 +145,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestGatewayConformance|TestGateway/managed-owner|TestCNIVersionSkew|TestGateway TEST_FILE_NAME: junit.xml TEST_SUITE: pilot TEST_SUITE_DESC: Istio Integration pilot @@ -182,7 +180,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestTrafficWithCNIUpgrade|TestCNIMisconfigHealsOnRestart|TestGatewayConformance|TestAPIServer|TestTCPRoute|TestTLSRoute TEST_FILE_NAME: junit.xml TEST_SUITE: ambient TEST_SUITE_DESC: Istio Integration ambient diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.27.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.27.yaml index 0cad9caf9e236..b2a8eddd996b8 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.27.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.27.yaml @@ -110,7 +110,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestAmbientInstall|TestAmbientInstallMultiNamespace|TestCanaryUpgradeFromTwoMinorRelease|TestAmbientStableRevisionLabelsGatewayStatus|TestStableRevisionLabelsUpgradeFromPreviousMinorRelease|TestStableRevisionLabelsUpgradeFromTwoMinorRelease|TestAmbientInPlaceUpgradeFromPreviousMinorRelease|TestZtunnelFromPreviousMinorRelease TEST_FILE_NAME: junit.xml TEST_SUITE: helm TEST_SUITE_DESC: Istio Integration helm @@ -146,7 +145,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestGatewayConformance|TestGateway/managed-owner|TestCNIVersionSkew|TestGateway TEST_FILE_NAME: junit.xml TEST_SUITE: pilot TEST_SUITE_DESC: Istio Integration pilot @@ -182,7 +180,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestTrafficWithCNIUpgrade|TestCNIMisconfigHealsOnRestart|TestGatewayConformance|TestAPIServer|TestTCPRoute|TestTLSRoute TEST_FILE_NAME: junit.xml TEST_SUITE: ambient TEST_SUITE_DESC: Istio Integration ambient diff --git a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.28.yaml b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.28.yaml index 839806fe7522a..b85da1e5c23f7 100644 --- a/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.28.yaml +++ b/ci-operator/config/openshift-service-mesh/istio/openshift-service-mesh-istio-release-1.28.yaml @@ -134,7 +134,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestAmbientInstall|TestAmbientInstallMultiNamespace|TestCanaryUpgradeFromTwoMinorRelease|TestAmbientStableRevisionLabelsGatewayStatus|TestStableRevisionLabelsUpgradeFromPreviousMinorRelease|TestStableRevisionLabelsUpgradeFromTwoMinorRelease|TestAmbientInPlaceUpgradeFromPreviousMinorRelease|TestZtunnelFromPreviousMinorRelease TEST_FILE_NAME: junit.xml TEST_SUITE: helm TEST_SUITE_DESC: Istio Integration helm @@ -170,7 +169,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_TESTS: TestGatewayConformance|TestGateway/managed-owner|TestCNIVersionSkew|TestGateway TEST_FILE_NAME: junit.xml TEST_SUITE: pilot TEST_SUITE_DESC: Istio Integration pilot @@ -206,8 +204,6 @@ tests: MAISTRA_NAMESPACE: maistra-e2e-test MAISTRA_SC_POD: maistra-e2e-test-sc-pod REPORT_TO_REPORT_PORTAL: "true" - SKIPPED_SUITES: pqc - SKIPPED_TESTS: TestTrafficWithCNIUpgrade|TestCNIMisconfigHealsOnRestart|TestGatewayConformance|TestAPIServer|TestTCPRoute|TestTLSRoute|TestWaypointAsEgressGateway/http_origination_targetPort_with_BackendTLSPolicy|TestWaypointAsEgressGateway/http_origination_route_with_BackendTLSPolicy TEST_FILE_NAME: junit.xml TEST_SUITE: ambient TEST_SUITE_DESC: Istio Integration ambient diff --git a/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-commands.sh b/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-commands.sh index c7ddea18df518..c8165bb1409cc 100644 --- a/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-commands.sh +++ b/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-commands.sh @@ -22,23 +22,54 @@ run_tests() { AMBIENT_ENV_VAR_EXPORT="export TRUSTED_ZTUNNEL_NAMESPACE=ztunnel" fi + echo "Downloading info about skipping tests from openshift-service-mesh/ci-utils" + curl -fo config.yaml https://raw.githubusercontent.com/openshift-service-mesh/ci-utils/refs/heads/main/skip_tests/test-config-full.yaml + curl -fO https://raw.githubusercontent.com/openshift-service-mesh/ci-utils/refs/heads/main/skip_tests/parse-test-config.sh + chmod +x ./parse-test-config.sh + + # parse-test-config.sh expects midstream_sail vs midstream_helm (istio CP uses helm-style install in CI) + case "${CONTROL_PLANE_SOURCE}" in + sail) + PARSE_TEST_CONFIG_MIDSTREAM_VARIANT="midstream_sail" + ;; + istio) + PARSE_TEST_CONFIG_MIDSTREAM_VARIANT="midstream_helm" + ;; + *) + echo "Unsupported CONTROL_PLANE_SOURCE: ${CONTROL_PLANE_SOURCE} (expected istio or sail)" >&2 + exit 1 + ;; + esac + + # get info about branch + BRANCH=$(echo "${JOB_SPEC}" | jq -r '.extra_refs[].base_ref' 2>/dev/null || echo "${JOB_SPEC}" | jq -r '.refs.base_ref') + # run parser script to see the output + echo "[debug] BRANCH: ${BRANCH}" + ./parse-test-config.sh config.yaml "${TEST_SUITE}" "${PARSE_TEST_CONFIG_MIDSTREAM_VARIANT}" "${BRANCH}" + # it will eval SKIP_PARSER_SKIP_TESTS and SKIP_PARSER_SKIP_SUBSUITES ENV variables which will be used in the prow/integ-suite-ocp.sh + eval $(./parse-test-config.sh config.yaml "${TEST_SUITE}" "${PARSE_TEST_CONFIG_MIDSTREAM_VARIANT}" "${BRANCH}") + echo "[debug] ENVS after parser skip tests" + echo "[debug] SKIP_PARSER_SKIP_TESTS: ${SKIP_PARSER_SKIP_TESTS}" + echo "[debug] SKIP_PARSER_SKIP_SUBSUITES: ${SKIP_PARSER_SKIP_SUBSUITES}" + oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \ - sh -c " + sh -c ' export KUBECONFIG=/work/ci-kubeconfig - export BUILD_WITH_CONTAINER=\"0\" + export BUILD_WITH_CONTAINER="0" export ENABLE_OVERLAY2_STORAGE_DRIVER=true - export DOCKER_INSECURE_REGISTRIES=\"default-route-openshift-image-registry.\$(oc get routes -A -o jsonpath='{.items[0].spec.host}' | awk -F. '{print substr(\$0, index(\$0,\$2))}')\" - export ARTIFACT_DIR=\"${ARTIFACT_DIR}\" - export CONTROL_PLANE_SOURCE=\"${CONTROL_PLANE_SOURCE}\" - export INSTALL_SAIL_OPERATOR=\"${INSTALL_SAIL_OPERATOR}\" - export AMBIENT=\"${AMBIENT}\" - ${AMBIENT_ENV_VAR_EXPORT:-} - ${HELM_ENV_VAR_EXPORT:-} + export DOCKER_INSECURE_REGISTRIES="default-route-openshift-image-registry.$(oc get routes -A -o jsonpath='"'"'{.items[0].spec.host}'"'"' | awk -F. '"'"'{print substr($0, index($0,$2))}'"'"')" + export ARTIFACT_DIR="'"${ARTIFACT_DIR}"'" + export CONTROL_PLANE_SOURCE="'"${CONTROL_PLANE_SOURCE}"'" + export INSTALL_SAIL_OPERATOR="'"${INSTALL_SAIL_OPERATOR}"'" + export AMBIENT="'"${AMBIENT}"'" + '"${AMBIENT_ENV_VAR_EXPORT:-}"' + '"${HELM_ENV_VAR_EXPORT:-}"' oc version cd /work entrypoint \ prow/integ-suite-ocp.sh \ - ${TEST_SUITE} '${SKIPPED_TESTS}' '${SKIPPED_SUITES}'" + "'"${TEST_SUITE}"'" "'"${SKIP_PARSER_SKIP_TESTS}"'" "'"${SKIP_PARSER_SKIP_SUBSUITES}"'" + ' } # check if /tmp/ISTIO_TESTS_DONE file exists which marks whole test run as done diff --git a/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-ref.yaml b/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-ref.yaml index 48616e8a9a3b2..dea516672f17a 100644 --- a/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-ref.yaml +++ b/ci-operator/step-registry/servicemesh/istio/int-tests/servicemesh-istio-int-tests-ref.yaml @@ -31,13 +31,5 @@ ref: - name: TEST_SUITE documentation: |- Which test suite should be run: 'ambient|security|telemetry|pilot|helm' - - name: SKIPPED_TESTS - default: "" - documentation: |- - Which tests should be skipped: e.g. 'TestAPIServer|TestTCPRoute|TestTLSRoute' - - name: SKIPPED_SUITES - default: "" - documentation: |- - Which suites should be skipped: e.g. 'external_ca|file_mounted_certs|policy_attachment_only' documentation: |- Runs Istio integration tests in given MAISTRA_SC_POD which must be prepared in advance.