Skip to content

Commit

Permalink
Ci/runners update (#2058)
Browse files Browse the repository at this point in the history
* ci - change self-hosted runners

* ci - update zombie tests

* telegram notification fix

* add default timeouts to ci jobs

* disable coverage-self-hosted and zombie-tests

---------

Co-authored-by: Kirill Azovtsev <[email protected]>
Co-authored-by: kamilsa <[email protected]>
  • Loading branch information
3 people authored Apr 27, 2024
1 parent b528b24 commit 6db7b0b
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 35 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/telegram_notify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ name: Telegram Notification
on:
pull_request:
types: [created, closed, opened, reopened]
pull_request_target:
types: [ created, closed, opened, reopened]
issues:
types: [created, closed, opended, reopened]

jobs:
notify:
runs-on: ubuntu-latest
steps:
#- uses: actions/checkout@v2
- name: Notify the commit on Telegram
uses: EverythingSuckz/github-telegram-notify@main
with:
Expand Down
47 changes: 30 additions & 17 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
branches: [ master ]
tags: [ '*' ]
pull_request:
workflow_dispatch:

env:
BUILD_DIR: build
Expand All @@ -31,6 +32,7 @@ env:
jobs:
MacOS:
runs-on: macos-14
timeout-minutes: 60
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
- uses: actions/cache@937d24475381cd9c75ae6db12cb4e79714b926ed
Expand All @@ -57,6 +59,7 @@ jobs:

name: "${{ matrix.options.name }}"
runs-on: ubuntu-latest
timeout-minutes: 60
container: qdrvm/kagome-dev:6-minideb
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand Down Expand Up @@ -94,7 +97,8 @@ jobs:
run: ./housekeeping/make_external_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain/clang-15_cxx20.cmake

name: "${{ matrix.options.name }}"
runs-on: [ self-hosted ]
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
container: qdrvm/kagome-dev:6-minideb
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand Down Expand Up @@ -132,7 +136,8 @@ jobs:
run: ./housekeeping/make_external_build.sh -DCLEAR_OBJS=ON -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain/clang-15_cxx20.cmake

name: "${{ matrix.options.name }}"
runs-on: [ self-hosted ]
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
container: qdrvm/kagome-dev:6-minideb
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand All @@ -157,6 +162,7 @@ jobs:
clang-tidy:
name: "Linux: clang-tidy"
runs-on: ubuntu-latest
timeout-minutes: 60
container: qdrvm/kagome-dev:6-minideb
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand All @@ -177,9 +183,10 @@ jobs:
./housekeeping/clang-tidy-diff.sh
coverage-self-hosted:
if: ${{ github.ref == 'refs/heads/master' || startsWith( github.ref, 'refs/tags/') || contains( github.event.pull_request.labels.*.name, 'Non-master self-hosted') }}
if: false # ${{ github.ref == 'refs/heads/master' || startsWith( github.ref, 'refs/tags/') || contains( github.event.pull_request.labels.*.name, 'Non-master self-hosted') }}
name: "Self-hosted: Linux: gcc-12 coverage/sonar"
runs-on: [ self-hosted ]
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
container: qdrvm/kagome-dev:6-minideb
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand Down Expand Up @@ -228,6 +235,7 @@ jobs:
build-type: "Release"
name: "${{ matrix.options.name }}"
runs-on: ubuntu-latest
timeout-minutes: 60
container: qdrvm/kagome-dev:6-minideb
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand All @@ -251,7 +259,8 @@ jobs:
- name: "Self-hosted: Minideb: Build Release"
build-type: "Release"
name: "${{ matrix.options.name }}"
runs-on: [ self-hosted ]
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
container: qdrvm/kagome-dev:6-minideb
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand All @@ -277,7 +286,8 @@ jobs:
build-type: "Release"
- name: "Self-hosted: Push RelWithDebInfo Docker image"
build-type: "RelWithDebInfo"
runs-on: [ self-hosted ]
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
container: qdrvm/kagome-dev@sha256:14d5aa92c971073e82ba9bbac9b615701e99c71f64e58bdd45e5b3dbc09944bd
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand Down Expand Up @@ -314,7 +324,8 @@ jobs:
build-type: "Release"
- name: "Self-hosted: Push RelWithDebInfo Docker image"
build-type: "RelWithDebInfo"
runs-on: [ self-hosted ]
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
container: qdrvm/kagome-dev@sha256:14d5aa92c971073e82ba9bbac9b615701e99c71f64e58bdd45e5b3dbc09944bd
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
Expand Down Expand Up @@ -342,6 +353,7 @@ jobs:
run: ./housekeeping/docker/kagome/build_and_push.sh

zombie-tests:
if: false
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -374,7 +386,8 @@ jobs:
test: "test0010"
- name: "Block building warp sync"
test: "test0011"
runs-on: [ self-hosted ]
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
needs: [Push-self-hosted]
steps:
- name: Set owner of working dir recurively
Expand All @@ -387,12 +400,12 @@ jobs:
working-directory: ./zombienet/docker
run: make ${{ matrix.options.test }}

Trigger_CD:
if: ${{ github.ref == 'refs/heads/master' }}
needs: [Push-self-hosted]
runs-on: ubuntu-latest
steps:
- name: trigger cd job
run: |
curl -fI "${{ secrets.JENKINS_URL }}kagome-test&token=${{ secrets.JENKINS_TOKEN }}"
curl -fI "${{ secrets.JENKINS_URL }}polkadot-test&token=${{ secrets.JENKINS_TOKEN }}"
# Trigger_CD:
# if: ${{ github.ref == 'refs/heads/master' }}
# needs: [Push-self-hosted]
# runs-on: ubuntu-latest
# steps:
# - name: trigger cd job
# run: |
# curl -fI "${{ secrets.JENKINS_URL }}kagome-test&token=${{ secrets.JENKINS_TOKEN }}"
# curl -fI "${{ secrets.JENKINS_URL }}polkadot-test&token=${{ secrets.JENKINS_TOKEN }}"
14 changes: 5 additions & 9 deletions .github/workflows/zombie-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,18 @@

name : Zombie Builder

# Update zombie builder image each Sunday night
on:
# schedule:
# - cron: '0 2 * * 0'
schedule:
- cron: '0 2 * * 0' # Update zombie builder image each Sunday night
workflow_dispatch:

jobs:
build_and_push_zombie_builder:
runs-on: [ kagome, self-hosted, linux ]
container: soramitsu/kagome-dev@sha256:a3153bda78e15337fc38b6800f508e8c3b27758cba6319e60e7c805b06e071f6
runs-on: [ actions-runner-controller ]
timeout-minutes: 120
container: qdrvm/kagome-dev@sha256:2d70246c32418a3dd45c246d3f5c2dd99bdafde145b903271849affe476c4cfc
steps:
- uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6
# - name: Install dependencies
# working-directory: ./zombienet/docker
# run: |
# pip install -r ./requirements.txt
- name: build zombie-builder
working-directory: ./zombienet/docker
run: make builder_last
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/zombie-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
#
# Copyright Quadrivium LLC
# All Rights Reserved
# SPDX-License-Identifier: Apache-2.0
#

name: Zombie-Tests

on:
push:
branches:
- "feature/zobbie-tests-python-fix"
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -40,8 +43,8 @@ jobs:
test: "test0010"
- name: "Block building warp sync"
test: "test0011"
runs-on: [ self-hosted ]
if: ${{ github.event_name == 'workflow_dispatch' }}
runs-on: [ actions-runner-controller ]
timeout-minutes: 60
steps:
- name: Set owner of working dir recurively
run: sudo chown -R $(whoami) .
Expand All @@ -51,4 +54,4 @@ jobs:
run: make tester
- name: Run test
working-directory: ./zombienet/docker
run: make ${{ matrix.options.test }}
run: make ${{ matrix.options.test }}

0 comments on commit 6db7b0b

Please sign in to comment.