diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml deleted file mode 100644 index 51ad704ecaf..00000000000 --- a/.github/workflows/integration-test.yml +++ /dev/null @@ -1,97 +0,0 @@ -name: Integration Test - -# Controls when the workflow will run -on: - # Triggers the workflow on push or pull request events but only for the "main" branch - push: - branches: [ "main", "branch-*" ] - pull_request: - branches: [ "main", "branch-*" ] - -concurrency: - group: ${{ github.worklfow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: ${{ github.event_name == 'pull_requests' }} - -jobs: - changes: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: dorny/paths-filter@v2 - id: filter - with: - filters: | - source_changes: - - .github/** - - api/** - - bin/** - - catalogs/** - - clients/** - - common/** - - conf/** - - core/** - - dev/** - - gradle/** - - integration-test/** - - meta/** - - server/** - - server-common/** - - trino-connector/** - - web/** - - docs/open-api/** - - build.gradle.kts - - gradle.properties - - gradlew - - setting.gradle.kts - outputs: - source_changes: ${{ steps.filter.outputs.source_changes }} - - # Integration test for AMD64 architecture - test-amd64-arch: - needs: changes - if: needs.changes.outputs.source_changes == 'true' - runs-on: ubuntu-latest - timeout-minutes: 30 - strategy: - matrix: - architecture: [linux/amd64] - java-version: [ 8, 11, 17 ] - test-mode: [ embedded, deploy ] - env: - DOCKER_RUN_NAME: hive-amd64 - PLATFORM: ${{ matrix.architecture }} - steps: - - uses: actions/checkout@v3 - - - uses: actions/setup-java@v3 - with: - java-version: ${{ matrix.java-version }} - distribution: 'temurin' - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Package Gravitino - run: | - ./gradlew build -x test -PjdkVersion=${{ matrix.java-version }} - ./gradlew compileDistribution -x test -PjdkVersion=${{ matrix.java-version }} - - - name: Setup debug Github Action - if: ${{ contains(github.event.pull_request.labels.*.name, 'debug action') }} - uses: csexton/debugger-action@master - - - name: Integration Test - id: integrationTest - run: | - ./gradlew test --rerun-tasks -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} - - - name: Upload integrate tests reports - uses: actions/upload-artifact@v3 - if: ${{ failure() && steps.integrationTest.outcome == 'failure' }} - with: - name: integrate test reports - path: | - build/reports - integration-test/build/integration-test.log - distribution/package/logs/gravitino-server.out - distribution/package/logs/gravitino-server.log diff --git a/.github/workflows/build.yml b/.github/workflows/test.yml similarity index 67% rename from .github/workflows/build.yml rename to .github/workflows/test.yml index 748aeff0599..e3d326fe5ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/test.yml @@ -109,3 +109,51 @@ jobs: run: | echo "Total coverage ${{ steps.jacoco.outputs.coverage-overall }}" echo "Changed Files coverage ${{ steps.jacoco.outputs.coverage-changed-files }}" + + test-amd64-arch: + needs: build + runs-on: ubuntu-latest + timeout-minutes: 30 + strategy: + matrix: + architecture: [linux/amd64] + java-version: [ 8, 11, 17 ] + test-mode: [ embedded, deploy ] + env: + DOCKER_RUN_NAME: hive-amd64 + PLATFORM: ${{ matrix.architecture }} + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java-version }} + distribution: 'temurin' + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Package Gravitino + run: | + ./gradlew build -x test -PjdkVersion=${{ matrix.java-version }} + ./gradlew compileDistribution -x test -PjdkVersion=${{ matrix.java-version }} + + - name: Setup debug Github Action + if: ${{ contains(github.event.pull_request.labels.*.name, 'debug action') }} + uses: csexton/debugger-action@master + + - name: Integration Test + id: integrationTest + run: | + ./gradlew test --rerun-tasks -PskipTests -PtestMode=${{ matrix.test-mode }} -PjdkVersion=${{ matrix.java-version }} + + - name: Upload integrate tests reports + uses: actions/upload-artifact@v3 + if: ${{ failure() && steps.integrationTest.outcome == 'failure' }} + with: + name: integrate test reports + path: | + build/reports + integration-test/build/integration-test.log + distribution/package/logs/gravitino-server.out + distribution/package/logs/gravitino-server.log \ No newline at end of file