mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Remove 3001 from CI: EoL
This commit is contained in:
krionbsd
Pedro Algarvio
parent
33f23e97e4
commit
a143b26bd4
7 changed files with 1 additions and 1865 deletions
3
.github/workflows/kitchen.vagrant.yml
vendored
3
.github/workflows/kitchen.vagrant.yml
vendored
|
|
@ -41,9 +41,6 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
instance:
|
instance:
|
||||||
- py3-git-3001-freebsd-130
|
|
||||||
- py3-git-3001-freebsd-123
|
|
||||||
# - py3-git-3001-openbsd-6
|
|
||||||
- py3-git-3002-freebsd-130
|
- py3-git-3002-freebsd-130
|
||||||
- py3-git-3002-freebsd-123
|
- py3-git-3002-freebsd-123
|
||||||
# - py3-git-3002-openbsd-6
|
# - py3-git-3002-openbsd-6
|
||||||
|
|
|
||||||
2
.github/workflows/kitchen.windows.yml
vendored
2
.github/workflows/kitchen.windows.yml
vendored
|
|
@ -44,7 +44,6 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
instance:
|
instance:
|
||||||
- py3-stable-3001-windows-2022
|
|
||||||
- py3-stable-3002-windows-2022
|
- py3-stable-3002-windows-2022
|
||||||
- py3-stable-3003-windows-2022
|
- py3-stable-3003-windows-2022
|
||||||
- py3-stable-3004-windows-2022
|
- py3-stable-3004-windows-2022
|
||||||
|
|
@ -100,7 +99,6 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
instance:
|
instance:
|
||||||
- py3-stable-3001-windows-2019
|
|
||||||
- py3-stable-3002-windows-2019
|
- py3-stable-3002-windows-2019
|
||||||
- py3-stable-3003-windows-2019
|
- py3-stable-3003-windows-2019
|
||||||
- py3-stable-3004-windows-2019
|
- py3-stable-3004-windows-2019
|
||||||
|
|
|
||||||
184
.github/workflows/main-branch-only.yml
vendored
184
.github/workflows/main-branch-only.yml
vendored
|
|
@ -8,98 +8,6 @@ on: [push]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
py3-stable-3001-gentoo:
|
|
||||||
name: Gentoo v3001 Py3 Stable
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 90
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Setup Ruby
|
|
||||||
uses: actions/setup-ruby@v1
|
|
||||||
with:
|
|
||||||
ruby-version: 2.6.x
|
|
||||||
|
|
||||||
- name: Install Bundler
|
|
||||||
run: |
|
|
||||||
gem install bundler
|
|
||||||
|
|
||||||
- name: Setup Bundle
|
|
||||||
run: |
|
|
||||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
|
||||||
|
|
||||||
- name: Set up Python 3.7
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
with:
|
|
||||||
python-version: 3.7
|
|
||||||
|
|
||||||
- name: Install Python Dependencies
|
|
||||||
run: |
|
|
||||||
pip install -U pip
|
|
||||||
pip install -r tests/requirements.txt
|
|
||||||
|
|
||||||
- name: Create Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen create py3-stable-3001-gentoo || bundle exec kitchen create py3-stable-3001-gentoo
|
|
||||||
|
|
||||||
- name: Test Bootstrap In Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen verify py3-stable-3001-gentoo
|
|
||||||
|
|
||||||
- name: Destroy Test Container
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen destroy py3-stable-3001-gentoo
|
|
||||||
|
|
||||||
|
|
||||||
py3-git-3001-gentoo:
|
|
||||||
name: Gentoo v3001 Py3 Git
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 90
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Setup Ruby
|
|
||||||
uses: actions/setup-ruby@v1
|
|
||||||
with:
|
|
||||||
ruby-version: 2.6.x
|
|
||||||
|
|
||||||
- name: Install Bundler
|
|
||||||
run: |
|
|
||||||
gem install bundler
|
|
||||||
|
|
||||||
- name: Setup Bundle
|
|
||||||
run: |
|
|
||||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
|
||||||
|
|
||||||
- name: Set up Python 3.7
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
with:
|
|
||||||
python-version: 3.7
|
|
||||||
|
|
||||||
- name: Install Python Dependencies
|
|
||||||
run: |
|
|
||||||
pip install -U pip
|
|
||||||
pip install -r tests/requirements.txt
|
|
||||||
|
|
||||||
- name: Create Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen create py3-git-3001-gentoo || bundle exec kitchen create py3-git-3001-gentoo
|
|
||||||
|
|
||||||
- name: Test Bootstrap In Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen verify py3-git-3001-gentoo
|
|
||||||
|
|
||||||
- name: Destroy Test Container
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen destroy py3-git-3001-gentoo
|
|
||||||
|
|
||||||
|
|
||||||
py3-stable-3002-gentoo:
|
py3-stable-3002-gentoo:
|
||||||
name: Gentoo v3002 Py3 Stable
|
name: Gentoo v3002 Py3 Stable
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
@ -468,98 +376,6 @@ jobs:
|
||||||
bundle exec kitchen destroy latest-gentoo
|
bundle exec kitchen destroy latest-gentoo
|
||||||
|
|
||||||
|
|
||||||
py3-stable-3001-gentoo-systemd:
|
|
||||||
name: Gentoo (systemd) v3001 Py3 Stable
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 90
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Setup Ruby
|
|
||||||
uses: actions/setup-ruby@v1
|
|
||||||
with:
|
|
||||||
ruby-version: 2.6.x
|
|
||||||
|
|
||||||
- name: Install Bundler
|
|
||||||
run: |
|
|
||||||
gem install bundler
|
|
||||||
|
|
||||||
- name: Setup Bundle
|
|
||||||
run: |
|
|
||||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
|
||||||
|
|
||||||
- name: Set up Python 3.7
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
with:
|
|
||||||
python-version: 3.7
|
|
||||||
|
|
||||||
- name: Install Python Dependencies
|
|
||||||
run: |
|
|
||||||
pip install -U pip
|
|
||||||
pip install -r tests/requirements.txt
|
|
||||||
|
|
||||||
- name: Create Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen create py3-stable-3001-gentoo-systemd || bundle exec kitchen create py3-stable-3001-gentoo-systemd
|
|
||||||
|
|
||||||
- name: Test Bootstrap In Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen verify py3-stable-3001-gentoo-systemd
|
|
||||||
|
|
||||||
- name: Destroy Test Container
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen destroy py3-stable-3001-gentoo-systemd
|
|
||||||
|
|
||||||
|
|
||||||
py3-git-3001-gentoo-systemd:
|
|
||||||
name: Gentoo (systemd) v3001 Py3 Git
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
timeout-minutes: 90
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v1
|
|
||||||
- name: Setup Ruby
|
|
||||||
uses: actions/setup-ruby@v1
|
|
||||||
with:
|
|
||||||
ruby-version: 2.6.x
|
|
||||||
|
|
||||||
- name: Install Bundler
|
|
||||||
run: |
|
|
||||||
gem install bundler
|
|
||||||
|
|
||||||
- name: Setup Bundle
|
|
||||||
run: |
|
|
||||||
bundle install --with docker --without opennebula ec2 windows vagrant
|
|
||||||
|
|
||||||
- name: Set up Python 3.7
|
|
||||||
uses: actions/setup-python@v1
|
|
||||||
with:
|
|
||||||
python-version: 3.7
|
|
||||||
|
|
||||||
- name: Install Python Dependencies
|
|
||||||
run: |
|
|
||||||
pip install -U pip
|
|
||||||
pip install -r tests/requirements.txt
|
|
||||||
|
|
||||||
- name: Create Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen create py3-git-3001-gentoo-systemd || bundle exec kitchen create py3-git-3001-gentoo-systemd
|
|
||||||
|
|
||||||
- name: Test Bootstrap In Test Container
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen verify py3-git-3001-gentoo-systemd
|
|
||||||
|
|
||||||
- name: Destroy Test Container
|
|
||||||
if: always()
|
|
||||||
run: |
|
|
||||||
bundle exec kitchen destroy py3-git-3001-gentoo-systemd
|
|
||||||
|
|
||||||
|
|
||||||
py3-stable-3002-gentoo-systemd:
|
py3-stable-3002-gentoo-systemd:
|
||||||
name: Gentoo (systemd) v3002 Py3 Stable
|
name: Gentoo (systemd) v3002 Py3 Stable
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
|
||||||
1610
.github/workflows/main.yml
vendored
1610
.github/workflows/main.yml
vendored
File diff suppressed because it is too large
Load diff
31
.github/workflows/templates/generate.py
vendored
31
.github/workflows/templates/generate.py
vendored
|
|
@ -54,25 +54,6 @@ STABLE_DISTROS = [
|
||||||
"ubuntu-2110",
|
"ubuntu-2110",
|
||||||
]
|
]
|
||||||
|
|
||||||
BLACKLIST_3001 = [
|
|
||||||
"almalinux-8",
|
|
||||||
"centos-stream8",
|
|
||||||
"debian-11",
|
|
||||||
"rockylinux-8",
|
|
||||||
"ubuntu-2110",
|
|
||||||
]
|
|
||||||
|
|
||||||
BLACKLIST_3001_0 = [
|
|
||||||
"almalinux-8",
|
|
||||||
"amazon-2",
|
|
||||||
"centos-stream8",
|
|
||||||
"debian-11",
|
|
||||||
"gentoo",
|
|
||||||
"gentoo-systemd",
|
|
||||||
"rockylinux-8",
|
|
||||||
"ubuntu-2110",
|
|
||||||
]
|
|
||||||
|
|
||||||
BLACKLIST_3002 = [
|
BLACKLIST_3002 = [
|
||||||
"almalinux-8",
|
"almalinux-8",
|
||||||
"centos-stream8",
|
"centos-stream8",
|
||||||
|
|
@ -119,8 +100,6 @@ BLACKLIST_3004_0 = [
|
||||||
]
|
]
|
||||||
|
|
||||||
SALT_BRANCHES = [
|
SALT_BRANCHES = [
|
||||||
"3001",
|
|
||||||
"3001-0",
|
|
||||||
"3002",
|
"3002",
|
||||||
"3002-0",
|
"3002-0",
|
||||||
"3003",
|
"3003",
|
||||||
|
|
@ -132,8 +111,6 @@ SALT_BRANCHES = [
|
||||||
]
|
]
|
||||||
|
|
||||||
BRANCH_DISPLAY_NAMES = {
|
BRANCH_DISPLAY_NAMES = {
|
||||||
"3001": "v3001",
|
|
||||||
"3001-0": "v3001.0",
|
|
||||||
"3002": "v3002",
|
"3002": "v3002",
|
||||||
"3002-0": "v3002.0",
|
"3002-0": "v3002.0",
|
||||||
"3003": "v3003",
|
"3003": "v3003",
|
||||||
|
|
@ -251,16 +228,10 @@ def generate_test_jobs():
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if bootstrap_type == "git":
|
if bootstrap_type == "git":
|
||||||
# .0 versions are a virtual version for pinning to the first point release of a major release, such as 3001, there is no git version.
|
# .0 versions are a virtual version for pinning to the first point release of a major release, such as 3002, there is no git version.
|
||||||
if branch.endswith("-0"):
|
if branch.endswith("-0"):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if branch == "3001" and distro in BLACKLIST_3001:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if branch == "3001-0" and distro in BLACKLIST_3001_0:
|
|
||||||
continue
|
|
||||||
|
|
||||||
if branch == "3002" and distro in BLACKLIST_3002:
|
if branch == "3002" and distro in BLACKLIST_3002:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,9 +17,6 @@ platforms:
|
||||||
- name: windows-2019
|
- name: windows-2019
|
||||||
|
|
||||||
suites:
|
suites:
|
||||||
- name: py3-stable-3001
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3001.7
|
|
||||||
- name: py3-stable-3002
|
- name: py3-stable-3002
|
||||||
provisioner:
|
provisioner:
|
||||||
salt_version: 3002
|
salt_version: 3002
|
||||||
|
|
|
||||||
33
kitchen.yml
33
kitchen.yml
|
|
@ -117,10 +117,6 @@ platforms:
|
||||||
run_command: /lib/systemd/systemd
|
run_command: /lib/systemd/systemd
|
||||||
|
|
||||||
suites:
|
suites:
|
||||||
- name: py3-git-3001
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3001
|
|
||||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
|
||||||
- name: py3-git-3002
|
- name: py3-git-3002
|
||||||
provisioner:
|
provisioner:
|
||||||
salt_version: 3002
|
salt_version: 3002
|
||||||
|
|
@ -133,35 +129,6 @@ suites:
|
||||||
provisioner:
|
provisioner:
|
||||||
salt_version: 3004
|
salt_version: 3004
|
||||||
salt_bootstrap_options: -x python3 -MPfq git %s
|
salt_bootstrap_options: -x python3 -MPfq git %s
|
||||||
- name: py3-stable-3001-0
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3001
|
|
||||||
salt_bootstrap_options: -x python3 -MP stable 3001.0
|
|
||||||
excludes:
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- debian-11
|
|
||||||
- fedora-33
|
|
||||||
- arch
|
|
||||||
- gentoo
|
|
||||||
- gentoo-systemd
|
|
||||||
- ubuntu-2110
|
|
||||||
- freebsd-130
|
|
||||||
- freebsd-123
|
|
||||||
- openbsd-6
|
|
||||||
- name: py3-stable-3001
|
|
||||||
provisioner:
|
|
||||||
salt_version: 3001
|
|
||||||
salt_bootstrap_options: -x python3 -MP stable %s
|
|
||||||
excludes:
|
|
||||||
- debian-11
|
|
||||||
- opensuse-15
|
|
||||||
- opensuse-tumbleweed
|
|
||||||
- arch
|
|
||||||
- ubuntu-2110
|
|
||||||
- freebsd-130
|
|
||||||
- freebsd-123
|
|
||||||
- openbsd-6
|
|
||||||
- name: py3-stable-3002-0
|
- name: py3-stable-3002-0
|
||||||
provisioner:
|
provisioner:
|
||||||
salt_version: 3002
|
salt_version: 3002
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue