e2e yaml changes

.github/workflows/e2e.yml

@@ -1,4 +1,4 @@
-# Copyright © 2021 Cask Data, Inc.
+# Copyright © 2023 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
@@ -16,9 +16,9 @@ name: Build e2e tests
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ develop, release/** ]
   pull_request:
-    branches: [ develop]
+    branches: [ develop, release/** ]
     types: [opened, synchronize, reopened, labeled]
   workflow_dispatch:
 
@@ -31,7 +31,7 @@ jobs:
     # 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'
@@ -74,11 +74,11 @@ jobs:
 
       - 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.tests }} --testRunner TestRunnerRequired.java --skipPluginUpload yes
+        run: python3 e2e/src/main/scripts/run_cdap_e2e_test.py --testRunner TestRunnerRequired.java --cdapBranch "${{ github.event.pull_request.base.ref }}"
 
       - 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.tests }} --skipPluginUpload yes
+        run: python3 e2e/src/main/scripts/run_cdap_e2e_test.py --testRunner TestRunnerRequired.java --cdapBranch "${{ github.event.pull_request.base.ref }}"
 
       - name: Upload report
         uses: actions/upload-artifact@v3
@@ -98,5 +98,5 @@ jobs:
         uses: google-github-actions/upload-cloud-storage@v0
         if: always()
         with:
-          path: ./plugin/target/cucumber-reports
+          path: ./plugin/cdap-e2e-tests/target/cucumber-reports
           destination: e2e-tests-cucumber-reports/${{ github.event.repository.name }}/${{ github.ref }}

pom.xml

@@ -2755,7 +2755,7 @@
         <module>cdap-distributions</module>
         <module>cdap-test</module>
         <module>cdap-integration-test</module>
-<!--        <module>cdap-ui</module>-->
+        <module>cdap-ui</module>
         <module>cdap-event-common-spi</module>
         <module>cdap-event-writer-spi</module>
         <module>cdap-event-reader-spi</module>