mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Fix the 3006 tests
This commit is contained in:
Twangboy
parent
fe0c975555
commit
5e6bcb5815
3 changed files with 33 additions and 34 deletions
48
.github/workflows/ci.yml
vendored
48
.github/workflows/ci.yml
vendored
|
|
@ -173,7 +173,7 @@ jobs:
|
|||
display-name: macOS 10.15
|
||||
timeout: 20
|
||||
runs-on: macos-10.15
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
|
||||
|
||||
|
||||
macos-11:
|
||||
|
|
@ -188,7 +188,7 @@ jobs:
|
|||
display-name: macOS 11
|
||||
timeout: 20
|
||||
runs-on: macos-11
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
|
||||
|
||||
|
||||
macos-12:
|
||||
|
|
@ -203,7 +203,7 @@ jobs:
|
|||
display-name: macOS 12
|
||||
timeout: 20
|
||||
runs-on: macos-12
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "latest"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "stable-3006", "latest"]'
|
||||
|
||||
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ jobs:
|
|||
distro-slug: almalinux-8
|
||||
display-name: AlmaLinux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
almalinux-9:
|
||||
|
|
@ -263,7 +263,7 @@ jobs:
|
|||
distro-slug: almalinux-9
|
||||
display-name: AlmaLinux 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["git-3005", "onedir-3005", "git-3006", "git-master", "onedir-nightly"]'
|
||||
|
||||
|
||||
amazon-2:
|
||||
|
|
@ -277,7 +277,7 @@ jobs:
|
|||
distro-slug: amazon-2
|
||||
display-name: Amazon 2
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
arch:
|
||||
|
|
@ -291,7 +291,7 @@ jobs:
|
|||
distro-slug: arch
|
||||
display-name: Arch
|
||||
timeout: 20
|
||||
instances: '["git-master", "latest"]'
|
||||
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
|
||||
|
||||
|
||||
centos-7:
|
||||
|
|
@ -305,7 +305,7 @@ jobs:
|
|||
distro-slug: centos-7
|
||||
display-name: CentOS 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
centos-stream8:
|
||||
|
|
@ -319,7 +319,7 @@ jobs:
|
|||
distro-slug: centos-stream8
|
||||
display-name: CentOS Stream 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
centos-stream9:
|
||||
|
|
@ -333,7 +333,7 @@ jobs:
|
|||
distro-slug: centos-stream9
|
||||
display-name: CentOS Stream 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["git-3005", "onedir-3005", "git-3006", "git-master", "onedir-nightly"]'
|
||||
|
||||
|
||||
debian-10:
|
||||
|
|
@ -347,7 +347,7 @@ jobs:
|
|||
distro-slug: debian-10
|
||||
display-name: Debian 10
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
debian-11:
|
||||
|
|
@ -361,7 +361,7 @@ jobs:
|
|||
distro-slug: debian-11
|
||||
display-name: Debian 11
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
fedora-35:
|
||||
|
|
@ -375,7 +375,7 @@ jobs:
|
|||
distro-slug: fedora-35
|
||||
display-name: Fedora 35
|
||||
timeout: 20
|
||||
instances: '["git-master", "latest"]'
|
||||
instances: '["git-3006", "git-master", "latest"]'
|
||||
|
||||
|
||||
fedora-36:
|
||||
|
|
@ -389,7 +389,7 @@ jobs:
|
|||
distro-slug: fedora-36
|
||||
display-name: Fedora 36
|
||||
timeout: 20
|
||||
instances: '["git-master", "latest"]'
|
||||
instances: '["git-3006", "git-master", "latest"]'
|
||||
|
||||
|
||||
fedora-37:
|
||||
|
|
@ -431,7 +431,7 @@ jobs:
|
|||
distro-slug: gentoo
|
||||
display-name: Gentoo
|
||||
timeout: 90
|
||||
instances: '["git-master", "latest"]'
|
||||
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
|
||||
|
||||
|
||||
gentoo-systemd:
|
||||
|
|
@ -445,7 +445,7 @@ jobs:
|
|||
distro-slug: gentoo-systemd
|
||||
display-name: Gentoo (systemd)
|
||||
timeout: 90
|
||||
instances: '["git-master", "latest"]'
|
||||
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
|
||||
|
||||
|
||||
opensuse-15:
|
||||
|
|
@ -459,7 +459,7 @@ jobs:
|
|||
distro-slug: opensuse-15
|
||||
display-name: Opensuse 15
|
||||
timeout: 20
|
||||
instances: '["latest"]'
|
||||
instances: '["stable-3006", "latest"]'
|
||||
|
||||
|
||||
opensuse-tumbleweed:
|
||||
|
|
@ -473,7 +473,7 @@ jobs:
|
|||
distro-slug: opensuse-tumbleweed
|
||||
display-name: Opensuse Tumbleweed
|
||||
timeout: 20
|
||||
instances: '["git-master", "latest"]'
|
||||
instances: '["stable-3006", "git-3006", "git-master", "latest"]'
|
||||
|
||||
|
||||
oraclelinux-7:
|
||||
|
|
@ -487,7 +487,7 @@ jobs:
|
|||
distro-slug: oraclelinux-7
|
||||
display-name: Oracle Linux 7
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
oraclelinux-8:
|
||||
|
|
@ -501,7 +501,7 @@ jobs:
|
|||
distro-slug: oraclelinux-8
|
||||
display-name: Oracle Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
rockylinux-8:
|
||||
|
|
@ -515,7 +515,7 @@ jobs:
|
|||
distro-slug: rockylinux-8
|
||||
display-name: Rocky Linux 8
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
rockylinux-9:
|
||||
|
|
@ -529,7 +529,7 @@ jobs:
|
|||
distro-slug: rockylinux-9
|
||||
display-name: Rocky Linux 9
|
||||
timeout: 20
|
||||
instances: '["git-3005", "onedir-3005", "git-master", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["git-3005", "onedir-3005", "git-3006", "git-master", "onedir-nightly"]'
|
||||
|
||||
|
||||
ubuntu-2004:
|
||||
|
|
@ -543,7 +543,7 @@ jobs:
|
|||
distro-slug: ubuntu-2004
|
||||
display-name: Ubuntu 20.04
|
||||
timeout: 20
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3003", "stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
ubuntu-2204:
|
||||
|
|
@ -557,7 +557,7 @@ jobs:
|
|||
distro-slug: ubuntu-2204
|
||||
display-name: Ubuntu 22.04
|
||||
timeout: 20
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "git-master", "latest", "onedir-nightly", "onedir-rc-3006-0rc1", "onedir-rc-3006-0rc2"]'
|
||||
instances: '["stable-3004", "stable-3005", "onedir-3005", "stable-3006", "git-3006", "git-master", "latest", "onedir-nightly"]'
|
||||
|
||||
|
||||
set-pipeline-exit-status:
|
||||
|
|
|
|||
16
.github/workflows/templates/generate.py
vendored
16
.github/workflows/templates/generate.py
vendored
|
|
@ -1,9 +1,8 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
import os
|
||||
import json
|
||||
import pathlib
|
||||
import datetime
|
||||
import json
|
||||
import os
|
||||
import pathlib
|
||||
|
||||
os.chdir(os.path.abspath(os.path.dirname(__file__)))
|
||||
|
||||
|
|
@ -215,11 +214,10 @@ SALT_VERSIONS = [
|
|||
"3003",
|
||||
"3004",
|
||||
"3005",
|
||||
"3006",
|
||||
"master",
|
||||
"latest",
|
||||
"nightly",
|
||||
"3006-0rc1",
|
||||
"3006-0rc2",
|
||||
]
|
||||
|
||||
ONEDIR_SALT_VERSIONS = [
|
||||
|
|
@ -228,15 +226,13 @@ ONEDIR_SALT_VERSIONS = [
|
|||
"nightly",
|
||||
]
|
||||
|
||||
ONEDIR_RC_SALT_VERSIONS = [
|
||||
"3006-0rc1",
|
||||
"3006-0rc2",
|
||||
]
|
||||
ONEDIR_RC_SALT_VERSIONS = []
|
||||
|
||||
VERSION_DISPLAY_NAMES = {
|
||||
"3003": "v3003",
|
||||
"3004": "v3004",
|
||||
"3005": "v3005",
|
||||
"3006": "v3006",
|
||||
"master": "Master",
|
||||
"latest": "Latest",
|
||||
"nightly": "Nightly",
|
||||
|
|
|
|||
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,6 +1,9 @@
|
|||
/.project
|
||||
*.sw?
|
||||
*.un~
|
||||
.vagrant
|
||||
tools
|
||||
venv
|
||||
|
||||
# Pycharm
|
||||
.idea
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue