From 86c88eabc27c8aab33003c5d0ab4debdb0fdf131 Mon Sep 17 00:00:00 2001
From: sbansla <sbansla@twilio.com>
Date: Thu, 22 Feb 2024 10:36:57 +0530
Subject: [PATCH 1/2] chore: cluster tests enabled

---
 .github/workflows/test-and-deploy.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index 58c20112a4..cb88c7881f 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -42,15 +42,15 @@ jobs:
       - name: Run Unit Tests
         run: mvn test -B
 
-#      - name: Run Cluster Test
-#        if: (!github.event.pull_request.head.repo.fork)
-#        env:
-#          TWILIO_ACCOUNT_SID: ${{ secrets.TWILIO_ACCOUNT_SID }}
-#          TWILIO_API_KEY: ${{ secrets.TWILIO_CLUSTER_TEST_API_KEY}}
-#          TWILIO_API_SECRET: ${{ secrets.TWILIO_CLUSTER_TEST_API_KEY_SECRET }}
-#          TWILIO_FROM_NUMBER: ${{ secrets.TWILIO_FROM_NUMBER }}
-#          TWILIO_TO_NUMBER: ${{ secrets.TWILIO_TO_NUMBER }}
-#        run:  mvn test -DTest="ClusterTest" -B
+      - name: Run Cluster Test
+        if: (!github.event.pull_request.head.repo.fork)
+        env:
+          TWILIO_ACCOUNT_SID: ${{ secrets.TWILIO_ACCOUNT_SID }}
+          TWILIO_API_KEY: ${{ secrets.TWILIO_CLUSTER_TEST_API_KEY}}
+          TWILIO_API_SECRET: ${{ secrets.TWILIO_CLUSTER_TEST_API_KEY_SECRET }}
+          TWILIO_FROM_NUMBER: ${{ secrets.TWILIO_FROM_NUMBER }}
+          TWILIO_TO_NUMBER: ${{ secrets.TWILIO_TO_NUMBER }}
+        run:  mvn test -DTest="ClusterTest" -B
 
       - name: SonarCloud Scan
         if: ${{ (github.event_name == 'pull_request' || github.ref_type == 'branch') && matrix.java == 11 && !github.event.pull_request.head.repo.fork }}

From e2104c5dcfde6fa62c0c826f84064bb99e531bda Mon Sep 17 00:00:00 2001
From: Shubham <tiwarishubham635@gmail.com>
Date: Thu, 22 Feb 2024 13:04:42 +0530
Subject: [PATCH 2/2] chore: added java17 for sonarscan

---
 .github/workflows/test-and-deploy.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index cb88c7881f..ba2161ee98 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -52,6 +52,11 @@ jobs:
           TWILIO_TO_NUMBER: ${{ secrets.TWILIO_TO_NUMBER }}
         run:  mvn test -DTest="ClusterTest" -B
 
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '17'
+          
       - name: SonarCloud Scan
         if: ${{ (github.event_name == 'pull_request' || github.ref_type == 'branch') && matrix.java == 11 && !github.event.pull_request.head.repo.fork }}
         env: