diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml index 3c2be767ad22..0f74911f70b8 100644 --- a/.github/workflows/cancel.yml +++ b/.github/workflows/cancel.yml @@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy - requested jobs: cancel: - runs-on: [self-hosted, style-checker] + runs-on: dimerun-h9-ubuntu2204 steps: - uses: styfle/cancel-workflow-action@0.9.1 with: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 2494a8564bb7..27ee69db8dcb 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -18,7 +18,8 @@ on: # yamllint disable-line rule:truthy ########################################################################################## jobs: RunConfig: - runs-on: [self-hosted, style-checker-aarch64] + runs-on: dimerun-h9-ubuntu2204 + environment: ci-test outputs: data: ${{ steps.runconfig.outputs.CI_DATA }} steps: @@ -30,10 +31,16 @@ jobs: clear-repository: true # to ensure correct digests fetch-depth: 0 # to get version filter: tree:0 - - name: Labels check + - name: Install dependencies run: | - cd "$GITHUB_WORKSPACE/tests/ci" - python3 run_check.py + pip3 install PyGithub boto3 unidiff + # - name: Labels check + # env: + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # run: | + # cd "$GITHUB_WORKSPACE/tests/ci" + # python3 run_check.py - name: Python unit tests run: | cd "$GITHUB_WORKSPACE/tests/ci" @@ -46,7 +53,7 @@ jobs: - name: PrepareRunConfig id: runconfig run: | - python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json + python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json --skip-docker echo "::group::CI configuration" python3 -m json.tool ${{ runner.temp }}/ci_run_data.json @@ -57,6 +64,8 @@ jobs: cat ${{ runner.temp }}/ci_run_data.json echo 'EOF' } >> "$GITHUB_OUTPUT" + + cat ${{ runner.temp }}/ci_run_data.json - name: Re-create GH statuses for skipped jobs if any run: | python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ runner.temp }}/ci_run_data.json --update-gh-statuses diff --git a/.github/workflows/pull_request_approved.yml b/.github/workflows/pull_request_approved.yml index 3de4978ad686..cffea9531ec6 100644 --- a/.github/workflows/pull_request_approved.yml +++ b/.github/workflows/pull_request_approved.yml @@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy jobs: MergeOnApproval: - runs-on: [self-hosted, style-checker] + runs-on: dimerun-h9-ubuntu2204 steps: - name: Check out repository code uses: ClickHouse/checkout@v1 diff --git a/.github/workflows/reusable_docker.yml b/.github/workflows/reusable_docker.yml index 3fe1a8883c60..b350d6a9b777 100644 --- a/.github/workflows/reusable_docker.yml +++ b/.github/workflows/reusable_docker.yml @@ -13,7 +13,8 @@ name: Build docker images default: false jobs: DockerBuildAarch64: - runs-on: [self-hosted, style-checker-aarch64] + runs-on: dimerun-h9-ubuntu2204 + environment: ci-test if: | !failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_aarch64) != '[]' steps: @@ -21,14 +22,21 @@ jobs: uses: ClickHouse/checkout@v1 with: ref: ${{ fromJson(inputs.data).git_ref }} + - name: Install dependencies + run: | + pip3 install PyGithub boto3 unidiff - name: Build images + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} run: | python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \ --suffix aarch64 \ --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \ --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_aarch64) }}' DockerBuildAmd64: - runs-on: [self-hosted, style-checker] + runs-on: dimerun-h9-ubuntu2204 + environment: ci-test if: | !failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_amd64) != '[]' steps: @@ -37,6 +45,9 @@ jobs: with: ref: ${{ fromJson(inputs.data).git_ref }} - name: Build images + env: + AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} run: | python3 "${GITHUB_WORKSPACE}/tests/ci/docker_images_check.py" \ --suffix amd64 \ @@ -44,7 +55,7 @@ jobs: --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_amd64) }}' DockerMultiArchManifest: needs: [DockerBuildAmd64, DockerBuildAarch64] - runs-on: [self-hosted, style-checker] + runs-on: dimerun-h9-ubuntu2204 if: | !failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest) steps: