diff --git a/.github/workflows/pull-request-approved.yml b/.github/workflows/pull-request-approved.yml index 0c489fd7..7e34cf39 100644 --- a/.github/workflows/pull-request-approved.yml +++ b/.github/workflows/pull-request-approved.yml @@ -35,7 +35,7 @@ jobs: test: name: "Run all tests before merging" needs: calculate-xetabase-branch - uses: opencb/java-common-libs/.github/workflows/test-xetabase-workflow.yml@develop + uses: ./.github/workflows/test-xetabase-workflow.yml with: branch: ${{ needs.calculate-xetabase-branch.outputs.xetabase_branch }} task: ${{ github.event.pull_request.head.ref }} diff --git a/.github/workflows/test-analysis.yml b/.github/workflows/test-analysis.yml index 487cbb35..3af76372 100644 --- a/.github/workflows/test-analysis.yml +++ b/.github/workflows/test-analysis.yml @@ -39,4 +39,4 @@ jobs: check_name: "Surefire tests report" report_paths: './**/surefire-reports/TEST-*.xml' commit: '${{ github.sha }}' - fail_on_test_failures: true + fail_on_test_failures: true \ No newline at end of file diff --git a/.github/workflows/test-xetabase-workflow.yml b/.github/workflows/test-xetabase-workflow.yml index 0b060f58..3720d93c 100644 --- a/.github/workflows/test-xetabase-workflow.yml +++ b/.github/workflows/test-xetabase-workflow.yml @@ -77,17 +77,6 @@ jobs: with: mongodb-version: 6.0 mongodb-replica-set: rs-test - - name: K8s Tunnel MongoDB - run: | - wget https://dl.k8s.io/release/v1.28.2/bin/linux/amd64/kubectl - chmod +x ./kubectl - echo "${{ secrets.AZURE_KUBE_CONFIG }}" > admin.conf - ./kubectl -n cellbase-db port-forward services/cellbase-rs0-svc 27018:27017 --kubeconfig ./admin.conf & - - name: DockerHub login - uses: docker/login-action@v3 - with: - username: ${{ env.DOCKER_HUB_USER }} - password: ${{ env.DOCKER_HUB_PASSWORD }} - name: Install sshpass run: sudo apt-get install sshpass - name: Add SSH Host to known_hosts @@ -97,11 +86,11 @@ jobs: env: SSH_HOST: ${{ env.SSH_HOST }} SSH_PORT: ${{ env.SSH_PORT }} - - name: Run all OpenCB Junit tests, ie. java-common-libs, biodata, cellbase, opencga and opencga-enterprise + - name: Run all OpenCB Junit tests, ie. java-common-libs, biodata, opencga and opencga-enterprise run: | cd opencga-enterprise ln -s ../opencga opencga-home - ./build.sh -t -l runShortTests -b -s -T ${{ inputs.task }} -c localhost:27018 -H hdp3.1 + ./build.sh -t -l runShortTests -b -s -T ${{ inputs.task }} - name: Upload reports results to Github uses: actions/upload-artifact@v4 with: