mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-17 10:10:25 +00:00
Make CI job timeout configurable and raise timeout for Gentoo.
This commit is contained in:
parent
771b813928
commit
7fa4efbf20
3 changed files with 30 additions and 21 deletions
36
.github/workflows/main.yml
vendored
36
.github/workflows/main.yml
vendored
|
@ -3267,7 +3267,7 @@ jobs:
|
|||
py3-stable-2019-2-gentoo:
|
||||
name: Gentoo v2019.2 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3313,7 +3313,7 @@ jobs:
|
|||
py3-git-2019-2-gentoo:
|
||||
name: Gentoo v2019.2 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3359,7 +3359,7 @@ jobs:
|
|||
py3-stable-3000-gentoo:
|
||||
name: Gentoo v3000 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3405,7 +3405,7 @@ jobs:
|
|||
py3-git-3000-gentoo:
|
||||
name: Gentoo v3000 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3451,7 +3451,7 @@ jobs:
|
|||
py3-stable-3001-gentoo:
|
||||
name: Gentoo v3001 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3497,7 +3497,7 @@ jobs:
|
|||
py3-git-3001-gentoo:
|
||||
name: Gentoo v3001 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3543,7 +3543,7 @@ jobs:
|
|||
py3-stable-3001-0-gentoo:
|
||||
name: Gentoo v3001.0 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3589,7 +3589,7 @@ jobs:
|
|||
py3-git-master-gentoo:
|
||||
name: Gentoo Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3635,7 +3635,7 @@ jobs:
|
|||
latest-gentoo:
|
||||
name: Gentoo Latest packaged release
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3681,7 +3681,7 @@ jobs:
|
|||
py3-stable-2019-2-gentoo-systemd:
|
||||
name: Gentoo (systemd) v2019.2 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3727,7 +3727,7 @@ jobs:
|
|||
py3-git-2019-2-gentoo-systemd:
|
||||
name: Gentoo (systemd) v2019.2 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3773,7 +3773,7 @@ jobs:
|
|||
py3-stable-3000-gentoo-systemd:
|
||||
name: Gentoo (systemd) v3000 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3819,7 +3819,7 @@ jobs:
|
|||
py3-git-3000-gentoo-systemd:
|
||||
name: Gentoo (systemd) v3000 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3865,7 +3865,7 @@ jobs:
|
|||
py3-stable-3001-gentoo-systemd:
|
||||
name: Gentoo (systemd) v3001 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3911,7 +3911,7 @@ jobs:
|
|||
py3-git-3001-gentoo-systemd:
|
||||
name: Gentoo (systemd) v3001 Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -3957,7 +3957,7 @@ jobs:
|
|||
py3-stable-3001-0-gentoo-systemd:
|
||||
name: Gentoo (systemd) v3001.0 Py3 Stable
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -4003,7 +4003,7 @@ jobs:
|
|||
py3-git-master-gentoo-systemd:
|
||||
name: Gentoo (systemd) Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
@ -4049,7 +4049,7 @@ jobs:
|
|||
latest-gentoo-systemd:
|
||||
name: Gentoo (systemd) Latest packaged release
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: 45
|
||||
|
||||
needs: lint
|
||||
|
||||
|
|
13
.github/workflows/templates/generate.py
vendored
13
.github/workflows/templates/generate.py
vendored
|
@ -124,11 +124,18 @@ DISTRO_DISPLAY_NAMES = {
|
|||
'ubuntu-2004': 'Ubuntu 20.04',
|
||||
}
|
||||
|
||||
TIMEOUT_DEFAULT = 20
|
||||
TIMEOUT_OVERRIDES = {
|
||||
'gentoo': 45,
|
||||
'gentoo-systemd': 45,
|
||||
}
|
||||
|
||||
def generate_test_jobs():
|
||||
test_jobs = ''
|
||||
|
||||
for distro in LINUX_DISTROS + OSX + WINDOWS:
|
||||
timeout_minutes = TIMEOUT_OVERRIDES[distro] if distro in TIMEOUT_OVERRIDES else TIMEOUT_DEFAULT
|
||||
|
||||
for branch in SALT_BRANCHES:
|
||||
|
||||
if branch == 'master' and distro in SALT_POST_3000_BLACKLIST:
|
||||
|
@ -161,7 +168,8 @@ def generate_test_jobs():
|
|||
branch=branch,
|
||||
display_name='{} Latest packaged release'.format(
|
||||
DISTRO_DISPLAY_NAMES[distro],
|
||||
)
|
||||
),
|
||||
timeout_minutes=timeout_minutes
|
||||
)
|
||||
)
|
||||
continue
|
||||
|
@ -244,7 +252,8 @@ def generate_test_jobs():
|
|||
BRANCH_DISPLAY_NAMES[branch],
|
||||
python_version.capitalize(),
|
||||
bootstrap_type.capitalize()
|
||||
)
|
||||
),
|
||||
timeout_minutes=timeout_minutes
|
||||
)
|
||||
)
|
||||
|
||||
|
|
2
.github/workflows/templates/linux.yml
vendored
2
.github/workflows/templates/linux.yml
vendored
|
@ -1,7 +1,7 @@
|
|||
{python_version}-{bootstrap_type}-{branch}-{distro}:
|
||||
name: {display_name}
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 20
|
||||
timeout-minutes: {timeout_minutes}
|
||||
|
||||
needs: lint
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue