From 24eac5e58f15af387fd94bacb9a8af5533dc2dd2 Mon Sep 17 00:00:00 2001
From: Mirza Karacic <mkaracic@aerospike.com>
Date: Wed, 11 Dec 2024 14:37:58 -0800
Subject: [PATCH] Integration fixes

---
 .github/actions/build-and-test/action.yaml   |  4 ++--
 .github/actions/publish-to-jfrog/action.yaml |  3 +++
 .github/workflows/promote-to-stage.yaml      | 15 ++++++++++++---
 .github/workflows/promote.yaml               |  4 ++--
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/.github/actions/build-and-test/action.yaml b/.github/actions/build-and-test/action.yaml
index f9ab2d19b..27920a827 100644
--- a/.github/actions/build-and-test/action.yaml
+++ b/.github/actions/build-and-test/action.yaml
@@ -31,11 +31,11 @@ runs:
     - name: Stage crypto
       shell: bash
       run: |
-        ./set_cypto ${{ inputs.crypto-type }}
+        ./set_crypto ${{ inputs.crypto-type }}
 
     - name: Build
       shell: bash
-      run: mvn clean install -P ${{ inputs.crypto-type }}
+      run: mvn clean install
 
     - name: Run EE server
       if: ${{ inputs.run-tests == 'true' }}
diff --git a/.github/actions/publish-to-jfrog/action.yaml b/.github/actions/publish-to-jfrog/action.yaml
index 68f8a7654..3a0dc107a 100644
--- a/.github/actions/publish-to-jfrog/action.yaml
+++ b/.github/actions/publish-to-jfrog/action.yaml
@@ -49,4 +49,7 @@ runs:
       run: |
         jf mvn-config --repo-deploy-releases=${{ inputs.jfrog-releases-repo-name }} --repo-deploy-snapshots=${{ inputs.jfrog-snapshots-repo-name }}
         jf mvn source:jar javadoc:jar deploy -Dusername=${{ steps.setup-jfrog-cli.outputs.oidc-user }} ${{ steps.setup-jfrog-cli.outputs.oidc-token }}
+        jf rt bce
+        jf rt bag
+        jf rt bp
         jf rt bp
diff --git a/.github/workflows/promote-to-stage.yaml b/.github/workflows/promote-to-stage.yaml
index fe52abdf9..029a62db0 100644
--- a/.github/workflows/promote-to-stage.yaml
+++ b/.github/workflows/promote-to-stage.yaml
@@ -20,14 +20,23 @@ jobs:
         env:
           JF_URL: ${{ vars.JFROG_PLATFORM_URL }}
         with:
-          oidc-provider-name: ${{ inputs.oidc-provider }}
-          oidc-audience: ${{ inputs.oidc-audience }}
+          oidc-provider-name: ${{ secrets.JFROG_OIDC_PROVIDER }}
+          oidc-audience: ${{ secrets.JFROG_OIDC_AUDIENCE }}
 
       - name: Get info
         id: get-build-info
         run: |
           echo build-info=$(jf rt curl /api/build/clients-java-push-to-dev/${{ inputs.build-number }}) >> $GITHUB_OUTPUT
 
-      - name: Debug
+      - name: Debug build-info
         run: |
           echo ${{ steps.get-build-info.outputs.build-info }}
+
+      - name: Get commit hash
+        id: get-commit-hash
+        run: |
+          echo build-commit-hash=$(steps.get-build-info.outputs.build-info | jq -r '.vcs[].revision') >> $GITHUB_OUTPUT
+
+      - name: Debug commit hash
+        run: |
+          echo ${{ steps.get-commit-hash.outputs.build-commit-hash }}
diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml
index 302218397..92d14c482 100644
--- a/.github/workflows/promote.yaml
+++ b/.github/workflows/promote.yaml
@@ -25,8 +25,8 @@ jobs:
         env:
           JF_URL: ${{ vars.JFROG_PLATFORM_URL }}
         with:
-          oidc-provider-name: ${{ inputs.oidc-provider }}
-          oidc-audience: ${{ inputs.oidc-audience }}
+          oidc-provider-name: ${{ secrets.JFROG_OIDC_PROVIDER }}
+          oidc-audience: ${{ inputs.JFROG_OIDC_AUDIENCE }}
 
       - name: Get info
         id: get-build-info