From 5e2a2618bf9e138c22eb84b720993ec8934c5153 Mon Sep 17 00:00:00 2001 From: flukolo4ek Date: Thu, 19 Dec 2024 12:17:07 +0300 Subject: [PATCH] ci: BI-0 use GH runners --- .github/workflows/main.yml | 18 +++++++++--------- .../dl_file_uploader_lib/__init__.py | 2 -- lib/testenv-common/docker-compose.common.yml | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0e751e563..c06a5167b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -110,7 +110,7 @@ jobs: run: git branch --contains ${{ github.event.pull_request.base.sha }} gh_build_image: - runs-on: [ self-hosted, linux, k8s-runner-build ] + runs-on: ubuntu-22.04 needs: [ check-ci-allowed ] @@ -151,7 +151,7 @@ jobs: /bin/bash ci/build_naive.sh router: - runs-on: [ self-hosted, linux, k8s-runner-no-compose ] + runs-on: ubuntu-22.04 needs: gh_build_image container: image: "ghcr.io/${{ github.repository_owner }}/${{ github.event.repository.name }}/datalens_ci_with_code:${{ github.sha }}" @@ -234,7 +234,7 @@ jobs: pytest_split: name: Split pytest into jobs for each test type - runs-on: [ self-hosted, linux, k8s-runner-no-compose ] + runs-on: ubuntu-22.04 needs: [ router, check-skip-tests-label ] if: ${{ needs.check-skip-tests-label.outputs.result != 'true' }} @@ -267,7 +267,7 @@ jobs: run_tests_base: name: "🐍[pytest]${{ matrix.value }}" - runs-on: [ self-hosted, linux, k8s-runner-light ] + runs-on: ubuntu-22.04 permissions: packages: write contents: read @@ -313,7 +313,7 @@ jobs: run_tests_no_compose: name: "🐍[pytest][no_compose]${{ matrix.value }}" - runs-on: [ self-hosted, linux, k8s-runner-no-compose ] + runs-on: ubuntu-22.04 permissions: packages: write contents: read @@ -359,7 +359,7 @@ jobs: run_tests_fat: name: "🐍[pytest][fat]${{ matrix.value }}" - runs-on: [ self-hosted, linux, k8s-runner-fat ] + runs-on: ubuntu-22.04 permissions: packages: write contents: read @@ -406,7 +406,7 @@ jobs: run_tests_ext_public: name: "🐍[pytest][ext_public]${{ matrix.value }}" # using light runners for now, TBD: change when we have ext_public - runs-on: [ self-hosted, linux, k8s-runner-ext-public ] + runs-on: ubuntu-22.04 permissions: packages: read contents: read @@ -456,7 +456,7 @@ jobs: run: bash /src/ci/stop_compose.sh "${{ matrix.value }}" "${{ job.container.network }}" "${{ env.compose_prj }}" mypy: - runs-on: [ self-hosted, linux, k8s-runner-no-compose ] + runs-on: ubuntu-22.04 needs: gh_build_image container: # until https://github.com/github/docs/issues/25520 is resolved, using vars @@ -504,7 +504,7 @@ jobs: needs_json: ${{ toJson(needs) }} codestyle_all: - runs-on: [ self-hosted, linux, k8s-runner-no-compose ] + runs-on: ubuntu-22.04 needs: gh_build_image container: # until https://github.com/github/docs/issues/25520 is resolved, using vars diff --git a/lib/dl_file_uploader_lib/dl_file_uploader_lib/__init__.py b/lib/dl_file_uploader_lib/dl_file_uploader_lib/__init__.py index 2a21c7110..e69de29bb 100644 --- a/lib/dl_file_uploader_lib/dl_file_uploader_lib/__init__.py +++ b/lib/dl_file_uploader_lib/dl_file_uploader_lib/__init__.py @@ -1,2 +0,0 @@ -# TEST DL FILE UPLOADER - diff --git a/lib/testenv-common/docker-compose.common.yml b/lib/testenv-common/docker-compose.common.yml index 0f93668b3..554d47c17 100644 --- a/lib/testenv-common/docker-compose.common.yml +++ b/lib/testenv-common/docker-compose.common.yml @@ -1,4 +1,4 @@ -version: '3.7' +version: '3.9' x-constants: US_MASTER_TOKEN: &c-us-master-token "AC1ofiek8coB"