mirror of
https://github.com/saltstack/salt-bootstrap.git
synced 2025-04-16 09:40:21 +00:00
Don't even try to test Salt's master branch under Py2
This commit is contained in:
Pedro Algarvio
parent
fddc221512
commit
a9b8b4aa30
2 changed files with 14 additions and 421 deletions
414
.github/workflows/main.yml
vendored
414
.github/workflows/main.yml
vendored
|
|
@ -412,52 +412,6 @@ jobs:
|
|||
bundle exec kitchen destroy py3-git-3000-amazon-2
|
||||
|
||||
|
||||
py2-git-master-amazon-2:
|
||||
name: Amazon 2 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-amazon-2 || bundle exec kitchen create py2-git-master-amazon-2
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-amazon-2
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-amazon-2
|
||||
|
||||
|
||||
py3-git-master-amazon-2:
|
||||
name: Amazon 2 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -688,52 +642,6 @@ jobs:
|
|||
bundle exec kitchen destroy py2-git-3000-arch
|
||||
|
||||
|
||||
py2-git-master-arch:
|
||||
name: Arch Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-arch || bundle exec kitchen create py2-git-master-arch
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-arch
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-arch
|
||||
|
||||
|
||||
py2-stable-2018-3-centos-6:
|
||||
name: CentOS 6 v2018.3 Py2 Stable
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -1010,52 +918,6 @@ jobs:
|
|||
bundle exec kitchen destroy py2-git-3000-centos-6
|
||||
|
||||
|
||||
py2-git-master-centos-6:
|
||||
name: CentOS 6 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-centos-6 || bundle exec kitchen create py2-git-master-centos-6
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-centos-6
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-centos-6
|
||||
|
||||
|
||||
latest-centos-6:
|
||||
name: CentOS 6 Latest packaged release
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -1654,52 +1516,6 @@ jobs:
|
|||
bundle exec kitchen destroy py3-git-3000-centos-7
|
||||
|
||||
|
||||
py2-git-master-centos-7:
|
||||
name: CentOS 7 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-centos-7 || bundle exec kitchen create py2-git-master-centos-7
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-centos-7
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-centos-7
|
||||
|
||||
|
||||
py3-git-master-centos-7:
|
||||
name: CentOS 7 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -2528,52 +2344,6 @@ jobs:
|
|||
bundle exec kitchen destroy py2-git-3000-debian-8
|
||||
|
||||
|
||||
py2-git-master-debian-8:
|
||||
name: Debian 8 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-debian-8 || bundle exec kitchen create py2-git-master-debian-8
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-debian-8
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-debian-8
|
||||
|
||||
|
||||
latest-debian-8:
|
||||
name: Debian 8 Latest packaged release
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -3172,52 +2942,6 @@ jobs:
|
|||
bundle exec kitchen destroy py3-git-3000-debian-9
|
||||
|
||||
|
||||
py2-git-master-debian-9:
|
||||
name: Debian 9 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-debian-9 || bundle exec kitchen create py2-git-master-debian-9
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-debian-9
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-debian-9
|
||||
|
||||
|
||||
py3-git-master-debian-9:
|
||||
name: Debian 9 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -4368,52 +4092,6 @@ jobs:
|
|||
bundle exec kitchen destroy py3-git-3000-opensuse-15
|
||||
|
||||
|
||||
py2-git-master-opensuse-15:
|
||||
name: Opensuse 15 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-opensuse-15 || bundle exec kitchen create py2-git-master-opensuse-15
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-opensuse-15
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-opensuse-15
|
||||
|
||||
|
||||
py3-git-master-opensuse-15:
|
||||
name: Opensuse 15 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -5058,52 +4736,6 @@ jobs:
|
|||
bundle exec kitchen destroy py3-git-3000-ubuntu-1604
|
||||
|
||||
|
||||
py2-git-master-ubuntu-1604:
|
||||
name: Ubuntu 16.04 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-ubuntu-1604 || bundle exec kitchen create py2-git-master-ubuntu-1604
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-ubuntu-1604
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-ubuntu-1604
|
||||
|
||||
|
||||
py3-git-master-ubuntu-1604:
|
||||
name: Ubuntu 16.04 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
|
|
@ -5748,52 +5380,6 @@ jobs:
|
|||
bundle exec kitchen destroy py3-git-3000-ubuntu-1804
|
||||
|
||||
|
||||
py2-git-master-ubuntu-1804:
|
||||
name: Ubuntu 18.04 Master Py2 Git
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 10
|
||||
|
||||
needs: lint
|
||||
|
||||
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 py2-git-master-ubuntu-1804 || bundle exec kitchen create py2-git-master-ubuntu-1804
|
||||
|
||||
- name: Test Bootstrap In Test Container
|
||||
run: |
|
||||
bundle exec kitchen verify py2-git-master-ubuntu-1804
|
||||
|
||||
- name: Destroy Test Container
|
||||
if: always()
|
||||
run: |
|
||||
bundle exec kitchen destroy py2-git-master-ubuntu-1804
|
||||
|
||||
|
||||
py3-git-master-ubuntu-1804:
|
||||
name: Ubuntu 18.04 Master Py3 Git
|
||||
runs-on: ubuntu-latest
|
||||
|
|
|
|||
17
.github/workflows/templates/generate.py
vendored
17
.github/workflows/templates/generate.py
vendored
|
|
@ -138,13 +138,20 @@ def generate_test_jobs():
|
|||
continue
|
||||
|
||||
for python_version in ('py2', 'py3'):
|
||||
for bootstrap_type in ('stable', 'git'):
|
||||
if bootstrap_type == 'stable' and branch == 'master':
|
||||
continue
|
||||
if bootstrap_type == 'stable' and distro not in STABLE_DISTROS:
|
||||
|
||||
if branch == 'master' and python_version == 'py2':
|
||||
# Salt's master branch no longer supports Python 2
|
||||
continue
|
||||
|
||||
if bootstrap_type == 'stable' and branch in STABLE_BRANCH_BLACKLIST:
|
||||
for bootstrap_type in ('stable', 'git'):
|
||||
if bootstrap_type == 'stable':
|
||||
if branch == 'master':
|
||||
# For the master branch there's no stable build
|
||||
continue
|
||||
if distro not in STABLE_DISTROS:
|
||||
continue
|
||||
|
||||
if branch in STABLE_BRANCH_BLACKLIST:
|
||||
continue
|
||||
|
||||
if branch == '2018-3' and distro in BLACKLIST_2018:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue