From f1d629402248fbf5e21f7cdbb5987ee47b8a3319 Mon Sep 17 00:00:00 2001 From: Hang Date: Tue, 22 Oct 2024 14:12:40 +0800 Subject: [PATCH] test pr --- .github/workflows/provisioning-tests.yml | 2 +- .github/workflows/pull-request.yml | 41 +++++++++++++----------- .github/workflows/unit-test.yml | 1 + 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/.github/workflows/provisioning-tests.yml b/.github/workflows/provisioning-tests.yml index af7b556870d..052ccf69956 100644 --- a/.github/workflows/provisioning-tests.yml +++ b/.github/workflows/provisioning-tests.yml @@ -2,7 +2,7 @@ name: Provisioning tests on: pull_request: branches: - - release/v* + - "!release/v2.9-gha-test" jobs: provisioning_tests: strategy: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 9a783a4c05e..4ee2fb28f8d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -15,7 +15,8 @@ jobs: unit-tests: uses: ./.github/workflows/unit-test.yml build-chart: - runs-on: ubuntu-latest + runs-on: test-runner-1 + container: ubuntu:22.04 steps: - name: Checkout code uses: actions/checkout@v4 @@ -40,7 +41,8 @@ jobs: - name: Package run: ./scripts/chart/package build-server: - runs-on: ubuntu-latest + if: false + runs-on: test-runner-dind strategy: matrix: os: [linux] @@ -105,8 +107,9 @@ jobs: retention-days: 1 overwrite: false build-agent: + if: false needs: [build-server] - runs-on: ubuntu-latest + runs-on: test-runner-dind strategy: matrix: os: [linux] @@ -184,19 +187,19 @@ jobs: if-no-files-found: error retention-days: 1 overwrite: false - integration-tests: - needs: [build-agent] - uses: ./.github/workflows/integration-tests.yml - with: - parent_run_id: ${{ github.run_id }} - build-agent-windows: - strategy: - matrix: - os: [windows] - version: [2019, 2022] - runs-on: ${{ matrix.os }}-${{ matrix.version }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - name: Build Windows Agent Image - run: docker build -t ${{ env.IMAGE_AGENT }}:${{ env.TAG }} --build-arg VERSION=${{ env.COMMIT }} --build-arg SERVERCORE_VERSION=ltsc${{ matrix.version }} -f package/windows/Dockerfile.agent . + # integration-tests: + # needs: [build-agent] + # uses: ./.github/workflows/integration-tests.yml + # with: + # parent_run_id: ${{ github.run_id }} + # build-agent-windows: + # strategy: + # matrix: + # os: [windows] + # version: [2019, 2022] + # runs-on: ${{ matrix.os }}-${{ matrix.version }} + # steps: + # - name: Checkout code + # uses: actions/checkout@v4 + # - name: Build Windows Agent Image + # run: docker build -t ${{ env.IMAGE_AGENT }}:${{ env.TAG }} --build-arg VERSION=${{ env.COMMIT }} --build-arg SERVERCORE_VERSION=ltsc${{ matrix.version }} -f package/windows/Dockerfile.agent . diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 42a9a983fa3..31f08d7b87f 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -5,6 +5,7 @@ jobs: env: GOLANG_VERSION: '1.22' runs-on: test-runner-1 + container: ubuntu:22.04 timeout-minutes: 60 steps: - name: Checkout code