Update make e2e target (#50050)

* Update make e2e target * change test e2e names
openshift · Mar 20, 2024 · 7c9e943 · 7c9e943
1 parent e41e03b
commit 7c9e943
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 98 deletions.
diff --git a/ci-operator/config/maistra/istio-operator/maistra-istio-operator-maistra-3.0.yaml b/ci-operator/config/maistra/istio-operator/maistra-istio-operator-maistra-3.0.yaml
@@ -159,7 +159,7 @@ tests:
           memory: 100Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-hypershift
-- as: integration-ocp-4-15
+- as: e2e-ocp-4-15
   steps:
     cluster_profile: ossm-aws
     env:
@@ -186,7 +186,7 @@ tests:
           cpu: 200m
           memory: 200Mi
       timeout: 10m0s
-    - as: integration-ocp-4-15
+    - as: e2e-ocp-4-15
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
@@ -197,7 +197,7 @@ tests:
           export BUILD_WITH_CONTAINER="0" && \
           cd /work && \
           entrypoint \
-          make test.integration.ocp"
+          make test.e2e.ocp"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       env:
       - name: MAISTRA_NAMESPACE
@@ -210,7 +210,7 @@ tests:
           memory: 200Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-hypershift
-- as: integration-ocp-4-16
+- as: e2e-ocp-4-16
   optional: true
   steps:
     cluster_profile: ossm-aws
@@ -238,7 +238,7 @@ tests:
           cpu: 100m
           memory: 100Mi
       timeout: 10m0s
-    - as: integration-ocp-4-16
+    - as: e2e-ocp-4-16
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
@@ -249,7 +249,7 @@ tests:
           export BUILD_WITH_CONTAINER="0" && \
           cd /work && \
           entrypoint \
-          make test.integration.ocp"
+          make test.e2e.ocp"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       env:
       - name: MAISTRA_NAMESPACE
@@ -262,7 +262,7 @@ tests:
           memory: 100Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-hypershift
-- as: integration-ocp-4-15-arm
+- as: e2e-ocp-4-15-arm
   steps:
     cluster_profile: ossm-aws
     dependencies:
@@ -292,7 +292,7 @@ tests:
           cpu: 100m
           memory: 100Mi
       timeout: 10m0s
-    - as: integration-ocp-4-15-arm
+    - as: e2e-ocp-4-15-arm
       cli: latest
       commands: |
         oc rsh -n "${MAISTRA_NAMESPACE}" "${MAISTRA_SC_POD}" \
@@ -303,7 +303,7 @@ tests:
           export BUILD_WITH_CONTAINER="0" && \
           cd /work && \
           entrypoint \
-          make test.integration.ocp"
+          make test.e2e.ocp"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       env:
       - name: MAISTRA_NAMESPACE
@@ -316,7 +316,7 @@ tests:
           memory: 100Mi
       timeout: 2h0m0s
     workflow: servicemesh-istio-e2e-profile
-- as: integration-kind
+- as: e2e-kind
   steps:
     cluster_profile: ossm-aws
     dependencies:
@@ -343,7 +343,7 @@ tests:
           cpu: 100m
           memory: 100Mi
       timeout: 10m0s
-    - as: integration-kind
+    - as: e2e-kind
       cli: latest
       commands: |
         export QUAY_PASS=$(cat /maistra-secrets/password)
@@ -354,7 +354,7 @@ tests:
           docker login -u='maistra-dev+prow' -p=${QUAY_PASS} quay.io && \
           cd /work && \
           export BUILD_WITH_CONTAINER="0" && \
-          make test.integration.kind"
+          make test.e2e.kind"
         oc cp "${MAISTRA_NAMESPACE}"/"${MAISTRA_SC_POD}":"${ARTIFACT_DIR}"/. "${ARTIFACT_DIR}"
       credentials:
       - mount_path: /maistra-secrets