From 9a36c6e80c2415f5727b88afef870a8a15548640 Mon Sep 17 00:00:00 2001
From: Shoham Elias <116083498+shohamazon@users.noreply.github.com>
Date: Thu, 19 Sep 2024 13:07:38 +0300
Subject: [PATCH] Fix testing deployment

Signed-off-by: Guian Gumpac <guian.gumpac@improving.com>
---
 .github/workflows/java-cd.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml
index 26efa0cfb7..e9df283c50 100644
--- a/.github/workflows/java-cd.yml
+++ b/.github/workflows/java-cd.yml
@@ -221,16 +221,10 @@ jobs:
             fail-fast: false
             matrix:
                 host: ${{ fromJson(needs.load-platform-matrix.outputs.PLATFORM_MATRIX) }}
-
         runs-on: ${{ matrix.host.RUNNER }}
         steps:
-            - name: Start Valkey server
-              uses: ./.github/actions/install-valkey
-              with:
-                engine-version: "7.2.5"
-                target: ${{ matrix.host.TARGET }}
-
-            - uses: actions/checkout@v4
+            - name: Checkout
+              uses: actions/checkout@v4
               with:
                   submodules: recursive
 
@@ -244,6 +238,7 @@ jobs:
               uses: ./.github/workflows/install-shared-dependencies
               with:
                   os: ${{ matrix.host.OS }}
+                  engine-version: "7.2.5"
                   target: ${{ matrix.host.TARGET }}
                   github-token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -253,17 +248,26 @@ jobs:
                   version: "26.1"
                   repo-token: ${{ secrets.GITHUB_TOKEN }}
 
+            - name: Start standalone Valkey server
+              working-directory: utils
+              id: port
+              run: |
+                  PORT=$(python3 ./cluster_manager.py start -r 0 2>&1 | grep CLUSTER_NODES | cut -d = -f 2 | cut -d , -f 1 | cut -d : -f 2)
+                  echo "PORT=$PORT" >> $GITHUB_OUTPUT
+
             - name: Test deployment
               working-directory: java
+              env:
+                  PORT: ${{ steps.port.outputs.PORT }}
               run: |
                   export ORG_GRADLE_PROJECT_centralManualTestingAuthHeaderName="Authorization"
                   export ORG_GRADLE_PROJECT_centralManualTestingAuthHeaderValue="Bearer $(echo "${{ secrets.CENTRAL_TOKEN_USERNAME }}:${{ secrets.CENTRAL_TOKEN_PASSWORD }}" | base64)"
                   export GLIDE_RELEASE_VERSION=${{ env.RELEASE_VERSION }}
-                  ./gradlew :benchmarks:run --args="--minimal --clients glide"
+                  ./gradlew :benchmarks:run --args="--minimal --clients glide --port ${{ env.PORT }}"
 
     publish-release-to-maven:
         if: ${{ inputs.maven_publish == true || github.event_name == 'push' }}
-        needs: [test-deployment-on-all-architectures]
+        needs: [publish-to-maven-central-deployment, test-deployment-on-all-architectures]
         runs-on: ubuntu-latest
         environment: AWS_ACTIONS
         env:
@@ -287,4 +291,3 @@ jobs:
                   curl --request DELETE \
                   -u "${{ secrets.CENTRAL_TOKEN_USERNAME }}:${{ secrets.CENTRAL_TOKEN_PASSWORD }}" \
                   "https://central.sonatype.com/api/v1/publisher/deployment/${{ env.DEPLOYMENT_ID }}"
-