diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c29d5538..b4705164c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,10 +37,11 @@ jobs: slack_channel: ${{ secrets.SLACK_CHANNEL }} status: FAILED - determine-revision: + determine-es-build: runs-on: ubuntu-22.04 outputs: revision: ${{ steps.revision-argument.outputs.revision }} + release_build: ${{ steps.release-build-argument.outputs.release_build }} steps: - uses: actions/checkout@v4 - name: "Determine ES version" @@ -53,6 +54,20 @@ jobs: id: revision-argument run: | echo "revision= --revision=${{ steps.es-version.outputs.version }}" >> $GITHUB_OUTPUT + - name: "Determine ES release or snapshot" + id: release-build-argument + run: | + if [[ "${{ steps.es-version.outputs.version }}" != "current" && "${{ steps.es-version.outputs.version }}" != "latest" ]]; then + echo "release_build=" >> $GITHUB_ENV + else + echo "release_build= --source-build-release" >> $GITHUB_ENV + fi + - name: "Show revision argument" + if: ${{ steps.revision-argument.outputs.revision != '' }} + run: echo "Using${{ steps.revision-argument.outputs.revision }}" + - name: "Show release build argument" + if: ${{ steps.release-build-argument.outputs.release_build != '' }} + run: echo "Using${{ steps.release-build-argument.outputs.release_build }}" filter-pr-changes: runs-on: ubuntu-22.04 @@ -77,10 +92,13 @@ jobs: | join(",") ') if echo "$TRACKS" | grep -qw "full_ci"; then - echo 'track_filter=' >> $GITHUB_OUTPUT + echo 'track_filter=' >> $GITHUB_OUTPUT else - echo "track_filter= --track-filter=$TRACKS" >> $GITHUB_OUTPUT + echo "track_filter= --track-filter=$TRACKS" >> $GITHUB_OUTPUT fi + - name: show track filter argument + if: ${{ steps.track-filter.outputs.track_filter != '' }} + run: echo "Using${{ steps.track-filter.outputs.track_filter }}" test: strategy: @@ -114,7 +132,7 @@ jobs: rally-tracks-compat: needs: - filter-pr-changes - - determine-revision + - determine-es-build strategy: fail-fast: false @@ -155,8 +173,8 @@ jobs: run: df -h - name: "Install dependencies" run: python -m pip install .[develop] - - name: "Run tests${{ needs.filter-pr-changes.outputs.track_filter }}${{ needs.determine-revision.outputs.revision }}" - run: hatch -v -e it run test${{ needs.filter-pr-changes.outputs.track_filter }}${{ needs.determine-revision.outputs.revision }} + - name: "Run tests${{ needs.filter-pr-changes.outputs.track_filter }}${{ needs.determine-es-build.outputs.revision }}${{ needs.determine-es-build.outputs.release_build }}" + run: hatch -v -e it run test${{ needs.filter-pr-changes.outputs.track_filter }}${{ needs.determine-es-build.outputs.revision }}${{ needs.determine-es-build.outputs.release_build }} timeout-minutes: 160 env: # elastic/endpoint fetches assets from GitHub, authenticate to avoid