From 9dec97dd5718afff75e4bf1afd17d8460cf743ff Mon Sep 17 00:00:00 2001
From: chahatsagarmain <chahatsagar2003@gmail.com>
Date: Tue, 4 Feb 2025 01:48:05 +0530
Subject: [PATCH] changes

Signed-off-by: chahatsagarmain <chahatsagar2003@gmail.com>
---
 .github/workflows/e2e-test.yml | 31 ++++++-------------------------
 .github/workflows/frontend.yml |  3 +++
 2 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 8e371c20351..c52af573bbc 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -157,19 +157,9 @@ jobs:
         with:
           k8s_version: ${{ matrix.k8s_version }}
 
-      - name: Forward API port
-        run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
-
-      - name: Forward Frontend port
-        run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline-ui" 3000 3000
-
-      - name: Build frontend integration tests image
-        working-directory: ./test/frontend-integration-test
-        run: docker build . -t kfp-frontend-integration-test:local
-
-      - name: Frontend integration tests
-        run: docker run --net=host kfp-frontend-integration-test:local --remote-run true
-
+      - name: Forward API port and run integration test 
+        run: make test-e2e-frontend-integration-test
+        
       - name: Collect test results
         if: always()
         uses: actions/upload-artifact@v4
@@ -197,18 +187,9 @@ jobs:
         with:
           k8s_version: ${{ matrix.k8s_version }}
 
-      - name: Forward API port
-        run: ./.github/resources/scripts/forward-port.sh "kubeflow" "ml-pipeline" 8888 8888
-
-      - name: Install prerequisites
-        run: pip3 install -r ./test/sample-test/requirements.txt
-
-      - name: Basic sample tests - sequential
-        run:  python3 ./test/sample-test/sample_test_launcher.py sample_test run_test --namespace kubeflow --test-name sequential --results-gcs-dir output
-
-      - name: Basic sample tests - exit_handler
-        run: python3 ./test/sample-test/sample_test_launcher.py sample_test run_test --namespace kubeflow --test-name exit_handler --expected-result failed --results-gcs-dir output
-
+      - name: Forward API port and run integration tests
+        run: make test-e2e-basic-sample-tests
+        
       - name: Collect test results
         if: always()
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index 723217bf0ce..106a22165eb 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -24,6 +24,9 @@ jobs:
       with:
         node-version: '22'
     
+    - name: Setup frontend test
+      run: make setup-frontend-test
+    
     - name: Run Frontend Tests
       run: make test-frontend