From 3245c8d8e43104c1ac7202737080cd6e424dcbc2 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Tue, 16 Sep 2025 13:53:51 +0300 Subject: [PATCH 1/8] chore(ci): change runner to self-hosted for run e2e Signed-off-by: Nikita Korolev --- .github/workflows/dev_module_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_module_build.yml b/.github/workflows/dev_module_build.yml index f5d9b2c742..96a6f96445 100644 --- a/.github/workflows/dev_module_build.yml +++ b/.github/workflows/dev_module_build.yml @@ -516,7 +516,7 @@ jobs: run_e2e: if: ${{ github.event_name == 'pull_request' && github.event.action == 'labeled' && github.event.label.name == 'e2e/run' }} name: Run E2E tests - runs-on: ubuntu-latest + runs-on: [self-hosted, regular] needs: - dev_setup_build - set_e2e_requirement_status From 8ef0f2e3aa961f3695a202d1b2c75495678e9f48 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Tue, 16 Sep 2025 16:30:02 +0300 Subject: [PATCH 2/8] change for night tests Signed-off-by: Nikita Korolev --- .github/workflows/nightly_e2e_tests_ceph.yaml | 2 +- .github/workflows/nightly_e2e_tests_replicated.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly_e2e_tests_ceph.yaml b/.github/workflows/nightly_e2e_tests_ceph.yaml index a36f83ba6b..5cc4c2899f 100644 --- a/.github/workflows/nightly_e2e_tests_ceph.yaml +++ b/.github/workflows/nightly_e2e_tests_ceph.yaml @@ -32,7 +32,7 @@ defaults: jobs: show_dev_manifest: - runs-on: ubuntu-latest + runs-on: [self-hosted, regular] name: Run e2e steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/nightly_e2e_tests_replicated.yaml b/.github/workflows/nightly_e2e_tests_replicated.yaml index 3a35905111..e555821a0b 100644 --- a/.github/workflows/nightly_e2e_tests_replicated.yaml +++ b/.github/workflows/nightly_e2e_tests_replicated.yaml @@ -32,7 +32,7 @@ defaults: jobs: show_dev_manifest: - runs-on: ubuntu-latest + runs-on: [self-hosted, regular] name: Run e2e steps: - uses: actions/checkout@v4 From 58c1f70b3f2703e41ae915f9166b6c8975e2a361 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Tue, 16 Sep 2025 16:33:46 +0300 Subject: [PATCH 3/8] tst, ceph Signed-off-by: Nikita Korolev --- .github/workflows/nightly_e2e_tests_ceph.yaml | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/.github/workflows/nightly_e2e_tests_ceph.yaml b/.github/workflows/nightly_e2e_tests_ceph.yaml index 5cc4c2899f..71314aa0d1 100644 --- a/.github/workflows/nightly_e2e_tests_ceph.yaml +++ b/.github/workflows/nightly_e2e_tests_ceph.yaml @@ -76,49 +76,49 @@ jobs: run: | task run:ci -v - - uses: actions/upload-artifact@v4 - if: always() - with: - name: resources_from_failed_tests - path: /tmp/e2e_failed__* - if-no-files-found: ignore - - - name: Save results - working-directory: ./tests/e2e/ - if: always() - run: | - if [ -z "$SUMMARY" ]; then - SUMMARY=$(jq -n \ - --arg csi "$CSI" \ - --arg date "$DATE" \ - --arg startTime "$START_TIME" \ - --arg branch "$GITHUB_REF_NAME" \ - --arg status ":question: UNKNOWN" \ - --arg link "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" \ - '{ - CSI: $csi, - Date: $date, - StartTime: $startTime, - Branch: $branch, - Status: $status, - Link: $link - }' - ) - fi - echo $SUMMARY - - hash=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 32 | md5sum | awk '{print $1}') - - kubectl apply --filename - < Date: Tue, 16 Sep 2025 17:09:03 +0300 Subject: [PATCH 4/8] use trdl for install d8 cli Signed-off-by: Nikita Korolev --- .github/workflows/nightly_e2e_tests_ceph.yaml | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nightly_e2e_tests_ceph.yaml b/.github/workflows/nightly_e2e_tests_ceph.yaml index 71314aa0d1..a4f4020b61 100644 --- a/.github/workflows/nightly_e2e_tests_ceph.yaml +++ b/.github/workflows/nightly_e2e_tests_ceph.yaml @@ -51,12 +51,22 @@ jobs: echo "Install ginkgo" GINKGO_VERSION=$(go list -f '{{.Version}}' -m github.com/onsi/ginkgo/v2) go install "github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION}" - - - name: Install Deckhouse-cli - run: | - echo "Install d8" - curl -fsSL -o d8-install.sh https://raw.githubusercontent.com/deckhouse/deckhouse-cli/main/d8-install.sh - bash d8-install.sh + + - name: Setup d8 + uses: werf/trdl/actions/setup-app@v0.11.1 + with: + repo: d8 + url: https://deckhouse.ru/downloads/deckhouse-cli-trdl/ + root-version: 1 + root-sha512: 343bd5f0d8811254e5f0b6fe292372a7b7eda08d276ff255229200f84e58a8151ab2729df3515cb11372dc3899c70df172a4e54c8a596a73d67ae790466a0491 + group: 0 + channel: stable + + # - name: Install Deckhouse-cli + # run: | + # echo "Install d8" + # curl -fsSL -o d8-install.sh https://raw.githubusercontent.com/deckhouse/deckhouse-cli/main/d8-install.sh + # bash d8-install.sh - uses: azure/k8s-set-context@v4 with: From ce811fd0f49707e940926f822758197f0d9e67d3 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Tue, 16 Sep 2025 17:17:07 +0300 Subject: [PATCH 5/8] install kubectl Signed-off-by: Nikita Korolev --- .github/workflows/nightly_e2e_tests_ceph.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/nightly_e2e_tests_ceph.yaml b/.github/workflows/nightly_e2e_tests_ceph.yaml index a4f4020b61..fcaade53da 100644 --- a/.github/workflows/nightly_e2e_tests_ceph.yaml +++ b/.github/workflows/nightly_e2e_tests_ceph.yaml @@ -44,6 +44,9 @@ jobs: - name: Install Task uses: arduino/setup-task@v2 + + - uses: azure/setup-kubectl@v4 + id: install - name: Install ginkgo working-directory: ./tests/e2e/ From 00a23ab62e52245cb27ca07e20d04953d162ae96 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Tue, 21 Oct 2025 09:15:56 +0300 Subject: [PATCH 6/8] test Signed-off-by: Nikita Korolev --- .github/workflows/dev_module_build.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/dev_module_build.yml b/.github/workflows/dev_module_build.yml index 96a6f96445..cf2b6c1654 100644 --- a/.github/workflows/dev_module_build.yml +++ b/.github/workflows/dev_module_build.yml @@ -42,6 +42,9 @@ on: required: false pull_request: types: [opened, reopened, synchronize, labeled, unlabeled] + branches: + - main + - chore/ci/change-runner-e2e push: branches: - main @@ -56,6 +59,23 @@ concurrency: cancel-in-progress: true jobs: + test: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Docker login to Deckhouse dev registry + uses: docker/login-action@v3 + with: + registry: ${{ vars.DEV_REGISTRY }} + username: ${{ vars.DEV_MODULES_REGISTRY_LOGIN }} + password: ${{ secrets.DEV_MODULES_REGISTRY_PASSWORD }} + + - name: Pull Docker image + run: | + echo "Pull iimage" + docker pull dev-registry.deckhouse.io/sys/deckhouse-oss/install:main set_vars: runs-on: ubuntu-latest name: Get PR info and set vars From 5b921e7eada71b3fc69656165f7f790f04078ddf Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Tue, 21 Oct 2025 09:20:34 +0300 Subject: [PATCH 7/8] test 1 Signed-off-by: Nikita Korolev --- .github/workflows/dev_module_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_module_build.yml b/.github/workflows/dev_module_build.yml index b8543acd47..6671192184 100644 --- a/.github/workflows/dev_module_build.yml +++ b/.github/workflows/dev_module_build.yml @@ -59,7 +59,7 @@ concurrency: cancel-in-progress: true jobs: - test: + testDockerLogin: runs-on: ubuntu-latest steps: - name: Checkout repository From ea25adbcbf4160455c7e7343f67b8cadd7d8c3d0 Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Tue, 21 Oct 2025 09:27:01 +0300 Subject: [PATCH 8/8] test 2 Signed-off-by: Nikita Korolev --- .github/workflows/dev_module_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev_module_build.yml b/.github/workflows/dev_module_build.yml index 6671192184..03a17cf001 100644 --- a/.github/workflows/dev_module_build.yml +++ b/.github/workflows/dev_module_build.yml @@ -75,7 +75,9 @@ jobs: - name: Pull Docker image run: | echo "Pull iimage" - docker pull dev-registry.deckhouse.io/sys/deckhouse-oss/install:main + docker pull registry.deckhouse.ru/deckhouse/ce/install:alpha + # docker pull dev-registry.deckhouse.io/sys/deckhouse-oss/install:main + set_vars: runs-on: ubuntu-latest name: Get PR info and set vars