From 53ce134dcd7cd05e6d30693986d21a26f46ebe85 Mon Sep 17 00:00:00 2001
From: vipinbhatt <vipin.bhatt@cloudsufi.com>
Date: Tue, 7 Nov 2023 23:35:34 +0530
Subject: [PATCH] Use Skip Flag

---
 .github/workflows/e2e.yml | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index db40f1dfd104..e5686f291de2 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,4 +1,4 @@
-# Copyright © 2022 Cask Data, Inc.
+# Copyright © 2021 Cask Data, Inc.
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
 #  use this file except in compliance with the License. You may obtain a copy of
 #  the License at
@@ -18,20 +18,20 @@ on:
   push:
     branches: [ develop ]
   pull_request:
-    branches: [ develop ]
-    types: [ opened, synchronize, reopened, labeled ]
+    branches: [ develop]
+    types: [opened, synchronize, reopened, labeled]
   workflow_dispatch:
 
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: k8s-runner-e2e
     # We allow builds:
     # 1) When triggered manually
     # 2) When it's a merge into a branch
     # 3) For PRs that are labeled as build and
     #  - It's a code change
     #  - A build label was just added
-    # A bit complex but prevents builds when other labels are manipulated
+    # A bit complex, but prevents builds when other labels are manipulated
     if: >
       github.event_name == 'workflow_dispatch'
       || github.event_name == 'push'
@@ -40,25 +40,23 @@ jobs:
           )
     strategy:
       matrix:
-        module: [ cdap-e2e-tests ]
+        tests: [ systemadmin ]
       fail-fast: false
-
     steps:
       # Pinned 1.0.0 version
       - uses: actions/checkout@v3
         with:
           path: plugin
-          submodules: 'recursive'
-          ref: ${{ github.event.workflow_run.head_sha }}
 
-      - uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
+      - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50
+        # Pinned version 2.11.1
         if: github.event_name != 'workflow_dispatch' && github.event_name != 'push'
         id: filter
         with:
           working-directory: plugin
           filters: |
             e2e-test:
-              - '${{ matrix.module }}/**/e2e-test/**'
+              - '**/e2e-test/**'
 
       - name: Checkout e2e test repo
         uses: actions/checkout@v3
@@ -72,35 +70,34 @@ jobs:
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ github.workflow }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            ${{ runner.os }}-maven-${{ github.workflow }}
+        restore-keys: |
+          ${{ runner.os }}-maven-${{ github.workflow }}
 
       - name: Run required e2e tests
         if: github.event_name != 'workflow_dispatch' && github.event_name != 'push' && steps.filter.outputs.e2e-test == 'false'
-        run: python3 e2e/src/main/scripts/run_e2e_test.py --module ${{ matrix.module }} --testRunner TestRunnerRequired.java --skipPluginUpload yes
+        run: python3 e2e/src/main/scripts/run_e2e_test.py --module ${{ matrix.tests }} --testRunner TestRunnerRequired.java --skipPluginUpload yes
 
       - name: Run all e2e tests
         if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || steps.filter.outputs.e2e-test == 'true'
-        run: python3 e2e/src/main/scripts/run_e2e_test.py --module ${{ matrix.module }} --skipPluginUpload yes
+        run: python3 e2e/src/main/scripts/run_e2e_test.py --module ${{ matrix.tests }} --skipPluginUpload yes
 
       - name: Upload report
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: Cucumber report - ${{ matrix.module }}
-          path: ./**/target/cucumber-reports
+          name: Cucumber report - ${{ matrix.tests }}
+          path: ./plugin/target/cucumber-reports
 
       - name: Upload debug files
         uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: Debug files - ${{ matrix.module }}
+          name: Debug files - ${{ matrix.tests }}
           path: ./**/target/e2e-debug
 
       - name: Upload files to GCS
         uses: google-github-actions/upload-cloud-storage@v0
         if: always()
         with:
-          path: ./plugin
-          destination: e2e-tests-cucumber-reports/${{ github.event.repository.name }}/${{ github.ref }}
-          glob: '**/target/cucumber-reports/**'
\ No newline at end of file
+          path: ./plugin/target/cucumber-reports
+          destination: e2e-tests-cucumber-reports/${{ github.event.repository.name }}/${{ github.ref }}
\ No newline at end of file