diff --git a/.github/workflows/gradle-extraction-check.yml b/.github/workflows/gradle-extraction-check.yml index 5f742b2f90aa..c5b69667c302 100644 --- a/.github/workflows/gradle-extraction-check.yml +++ b/.github/workflows/gradle-extraction-check.yml @@ -1,4 +1,3 @@ -# This test covers TikaServer tests for SolrCell, since crave does not support docker yet. name: Extraction module tests with Docker on: diff --git a/.github/workflows/solrj-test.yml b/.github/workflows/solr-test.yml similarity index 61% rename from .github/workflows/solrj-test.yml rename to .github/workflows/solr-test.yml index 4e66e4af85df..83276013b771 100644 --- a/.github/workflows/solrj-test.yml +++ b/.github/workflows/solr-test.yml @@ -1,12 +1,13 @@ -name: SolrJ Tests +name: Solr Tests on: pull_request: branches: - '*' paths: - - '.github/workflows/solrj-test.yml' - - 'solr/solrj/**' + - '.github/workflows/solr-test.yml' + - 'solr/**/src/**' + - 'gradle/libs.versions.toml' concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -14,10 +15,10 @@ concurrency: jobs: test: - name: Run SolrJ Tests + name: Run Solr Tests runs-on: ubuntu-latest - timeout-minutes: 15 + timeout-minutes: 60 steps: - name: Checkout code @@ -25,5 +26,5 @@ jobs: - uses: ./.github/actions/prepare-for-build - - name: Test SolrJ module - run: ./gradlew solr:solrj:test + - name: Run tests + run: ./gradlew test --max-workers=4 -Ptests.jvms=4 diff --git a/.github/workflows/tests-via-crave.yml b/.github/workflows/tests-via-crave.yml deleted file mode 100644 index 14d09a964b11..000000000000 --- a/.github/workflows/tests-via-crave.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Solr Tests via Crave - -on: - pull_request: - branches: - - '*' - paths: - - 'solr/**/src/**' - - 'gradle/libs.versions.toml' - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: true - -jobs: - test: - name: Run Solr Tests using Crave.io resources - - runs-on: self-hosted - timeout-minutes: 40 - - env: - # Use a PR-scoped workspace path so that each new run for the same PR - # destroys any leftover resources from a previous run (including cancelled - # runs whose cleanup step may not have completed in time). - CRAVE_WORKSPACE: /crave-devspaces/pipeline/prs/${{ github.event.pull_request.number }} - - steps: - - name: Destroy previous clone - run: crave clone destroy -y ${CRAVE_WORKSPACE} || echo "Clone did not exist" - continue-on-error: true - - name: Crave clone sources - run: crave clone create --projectID 39 ${CRAVE_WORKSPACE} - - name: Checkout the correct branch - run: | - git -C ${CRAVE_WORKSPACE} fetch origin ${GITHUB_REF}:${GITHUB_REF} - git -C ${CRAVE_WORKSPACE} checkout ${GITHUB_REF} - - name: Initialize, build, test - run: | - cd ${CRAVE_WORKSPACE} - crave run --clean --message "PR: ${GITHUB_REF_NAME}" -- env CI=true ./gradlew --console=plain test - - name: Cleanup - if: ${{ always() }} - run: | - pushd ${CRAVE_WORKSPACE} - crave stop --all - popd - crave clone destroy -y ${CRAVE_WORKSPACE}