TASK-6807 - Pull request approve workflow Fail

.github/workflows/pull-request-approved.yml

@@ -20,14 +20,16 @@ jobs:
         name: "Get current branch for Xetabase from target branch"
         run: |
           chmod +x ./.github/workflows/scripts/get-xetabase-branch.sh
-          xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.base.ref }})
+          echo "github.event.pull_request.base.ref: ${{ github.event.pull_request.base.ref }}"
+          echo "github.event.pull_request.head.ref: ${{ github.event.pull_request.head.ref }}"
+          xetabase_branch=$(./.github/workflows/scripts/get-xetabase-branch.sh ${{ github.event.pull_request.head.ref }})
           echo "__Xetabase ref:__ \"${xetabase_branch}\"" | tee -a ${GITHUB_STEP_SUMMARY}
           echo "xetabase_branch=${xetabase_branch}" >> $GITHUB_OUTPUT
 
   test:
     name: "Run all tests before merging"
     needs: calculate-xetabase-branch
-    uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@TASK-6399
+    uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop
     with:
       branch: ${{ needs.calculate-xetabase-branch.outputs.xetabase_branch }}
       task: ${{ github.event.pull_request.head.ref }}

.github/workflows/scripts/get-xetabase-branch.sh

@@ -8,8 +8,8 @@ get_xetabase_branch() {
   # If the branch begins with 'TASK' and exists in the opencga-enterprise repository, I return it
   if [[ $input_branch == TASK* ]]; then
     if [ "$(git ls-remote https://github.com/zetta-genomics/opencga-enterprise.git "$input_branch" )" ] ; then
-      echo "$GIT_BRANCH";
-      exit 0;
+      echo "$input_branch";
+      return 0;
     fi
   fi
 

.github/workflows/test-xetabase-workflow.yml

@@ -41,10 +41,10 @@ jobs:
             AZURE_KUBE_CONFIG/field/Secret Value > env:AZURE_KUBE_CONFIG
             DOCKER_HUB_USER/field/Secret Value > env:DOCKER_HUB_USER
             DOCKER_HUB_PASSWORD/field/Secret Value > env:DOCKER_HUB_PASSWORD
-            SSH_TESTING_SERVER_HOST/field/Secret Value > env:SSH_TESTING_SERVER_HOST
-            SSH_TESTING_SERVER_PORT/field/Secret Value > env:SSH_TESTING_SERVER_PORT
-            SSH_TESTING_SERVER_USER/field/Secret Value > env:SSH_TESTING_SERVER_USER
-            SSH_TESTING_SERVER_PASSWORD/field/Secret Value > env:SSH_TESTING_SERVER_PASSWORD
+            SSH_TESTING_SERVER_HOST/field/Secret Value > env:SSH_HOST
+            SSH_TESTING_SERVER_PORT/field/Secret Value > env:SSH_PORT
+            SSH_TESTING_SERVER_USER/field/Secret Value > env:SSH_USER
+            SSH_TESTING_SERVER_PASSWORD/field/Secret Value > env:SSH_PASS
       - name: Log inputs
         run: |
           echo "__OpenCGA-enterprise branch:__ \"${{ inputs.branch }}\"" | tee -a $GITHUB_STEP_SUMMARY
@@ -104,18 +104,13 @@ jobs:
           password: ${{ env.DOCKER_HUB_PASSWORD }}
       - name: Run all OpenCB Junit tests, ie. java-common-libs, biodata, cellbase, opencga and opencga-enterprise
         run: |
-          pwd
-          ls -lrtha 
-          echo "------------------------------------"
-          cd opencga-enterprise
-          pwd
-          ls -lrtha 
-          echo "------------------------------------"
-          ln -s ../opencga opencga-home
-          echo "------------------------------------"
-          ls -lrtha 
-          #./build.sh -t -l runShortTests,runMediumTests,runLongTests -b -s -f -T ${{ inputs.task }} -c localhost:27018 -H hdp3.1
+          printenv
           ./build.sh -t -l runShortTests -b -s -f -T ${{ inputs.task }} -c localhost:27018 -H hdp3.1
+        env:
+          SSH_HOST: ${{ env.SSH_HOST }}
+          SSH_PORT: ${{ env.SSH_PORT }}
+          SSH_USER: ${{ env.SSH_USER }}
+          SSH_PASS: ${{ env.SSH_PASS }}
       - name: Upload reports results to Github
         uses: actions/upload-artifact@v4
         with:
@@ -126,16 +121,6 @@ jobs:
         with:
           name: build-log
           path: ./opencga-enterprise/build.log
-      - name: Upload junit reports to a remote scp server
-        uses: garygrossgarten/github-action-scp@release
-        with:
-          local: opencga-enterprise/reports/test
-          remote: /var/www/html/reports/xetabase/${{ inputs.task }}/
-          host: ${{ env.SSH_TESTING_SERVER_HOST}}
-          port: ${{ env.SSH_TESTING_SERVER_PORT}}
-          username: ${{ env.SSH_TESTING_SERVER_USER }}
-          password: ${{ env.SSH_TESTING_SERVER_PASSWORD }}
-          concurrency: 2
       - name: Log summary
         run: |
           cat ./opencga-enterprise/build.log | tee -a $GITHUB_STEP_SUMMARY