From ab0ecef9ca04b5d842a05ac238e0c428c73a6c36 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 12 Feb 2020 15:41:23 +0000 Subject: [PATCH] Salt 3000 is out, remove it from the blacklist --- .drone.jsonnet | 4 + .drone.yml | 466 ++++++++++++++- .github/workflows/main.yml | 736 ++++++++++++++++++++++++ .github/workflows/templates/generate.py | 1 - .kitchen.yml | 20 + 5 files changed, 1214 insertions(+), 13 deletions(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 40f1c94..2658f17 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,22 +1,26 @@ local git_suites = [ { name: 'Py2 2018.3(Git)', slug: 'py2-git-2018-3', depends: [] }, { name: 'Py2 2019.2(Git)', slug: 'py2-git-2019-2', depends: ['Py2 2018.3(Git)'] }, + { name: 'Py2 3000(Git)', slug: 'py2-git-3000', depends: ['Py2 2019.2(Git)'] }, // {name: 'Py2 develop(Stable)', slug: 'py2-git-develop'}, // Don't test against Salt's develop branch. Stability is not assured. ]; local git_py3_suites = [ { name: 'Py3 2018.3(Git)', slug: 'py3-git-2018-3', depends: [] }, { name: 'Py3 2019.2(Git)', slug: 'py3-git-2019-2', depends: ['Py3 2018.3(Git)'] }, + { name: 'Py3 3000(Git)', slug: 'py3-git-3000', depends: ['Py3 2019.2(Git)'] }, ]; local stable_suites = [ { name: 'Py2 2018.3(Stable)', slug: 'py2-stable-2018-3', depends: ['Py2 2018.3(Git)'] }, { name: 'Py2 2019.2(Stable)', slug: 'py2-stable-2019-2', depends: ['Py2 2019.2(Git)'] }, + { name: 'Py2 3000(Stable)', slug: 'py2-stable-3000', depends: ['Py2 3000(Git)'] }, ]; local stable_py3_suites = [ { name: 'Py3 2018.3(Stable)', slug: 'py3-stable-2018-3', depends: ['Py3 2018.3(Git)'] }, { name: 'Py3 2019.2(Stable)', slug: 'py3-stable-2019-2', depends: ['Py3 2019.2(Git)'] }, + { name: 'Py3 3000(Stable)', slug: 'py3-stable-3000', depends: ['Py3 3000(Git)'] }, ]; local distros = [ diff --git a/.drone.yml b/.drone.yml index ee3cba3..b699261 100644 --- a/.drone.yml +++ b/.drone.yml @@ -65,6 +65,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-arch + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -91,6 +104,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-arch + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -116,7 +142,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=72; echo Sleeping 72 seconds; sleep 72' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -157,6 +183,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -183,6 +222,19 @@ steps: - throttle-build - create +- name: Py2 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-stable-3000-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -196,6 +248,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -209,6 +274,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-amazon-2 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -234,7 +312,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=72; echo Sleeping 72 seconds; sleep 72' + - sh -c 't=108; echo Sleeping 108 seconds; sleep 108' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -275,6 +353,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -301,6 +392,19 @@ steps: - throttle-build - create +- name: Py2 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-stable-3000-centos-6 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -326,7 +430,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=192; echo Sleeping 192 seconds; sleep 192' + - sh -c 't=288; echo Sleeping 288 seconds; sleep 288' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -367,6 +471,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -393,6 +510,19 @@ steps: - throttle-build - create +- name: Py2 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-stable-3000-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -419,6 +549,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -445,6 +588,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -470,7 +626,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -498,6 +654,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -511,6 +680,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -536,7 +718,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=144; echo Sleeping 144 seconds; sleep 144' + - sh -c 't=216; echo Sleeping 216 seconds; sleep 216' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -577,6 +759,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -603,6 +798,19 @@ steps: - throttle-build - create +- name: Py2 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-stable-3000-debian-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -628,7 +836,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=336; echo Sleeping 336 seconds; sleep 336' + - sh -c 't=504; echo Sleeping 504 seconds; sleep 504' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -669,6 +877,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -695,6 +916,19 @@ steps: - throttle-build - create +- name: Py2 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-stable-3000-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -721,6 +955,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -747,6 +994,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -772,7 +1032,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=60; echo Sleeping 60 seconds; sleep 60' + - sh -c 't=120; echo Sleeping 120 seconds; sleep 120' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -800,6 +1060,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-debian-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -813,6 +1086,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-debian-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -838,7 +1124,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=96; echo Sleeping 96 seconds; sleep 96' + - sh -c 't=144; echo Sleeping 144 seconds; sleep 144' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -879,6 +1165,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-fedora-30 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -905,6 +1204,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-fedora-30 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -930,7 +1242,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=36; echo Sleeping 36 seconds; sleep 36' + - sh -c 't=54; echo Sleeping 54 seconds; sleep 54' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -971,6 +1283,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-fedora-31 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -996,7 +1321,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=24; echo Sleeping 24 seconds; sleep 24' + - sh -c 't=36; echo Sleeping 36 seconds; sleep 36' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1037,6 +1362,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-opensuse-15 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1062,7 +1400,7 @@ steps: - name: throttle-build image: alpine commands: - - sh -c 't=48; echo Sleeping 48 seconds; sleep 48' + - sh -c 't=72; echo Sleeping 72 seconds; sleep 72' - name: create image: saltstack/drone-salt-bootstrap-testing @@ -1103,6 +1441,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1129,6 +1480,19 @@ steps: - throttle-build - create +- name: Py2 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-stable-3000-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1155,6 +1519,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1181,6 +1558,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1247,6 +1637,19 @@ steps: - throttle-build - create +- name: Py2 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-git-3000-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1273,6 +1676,19 @@ steps: - throttle-build - create +- name: Py2 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py2-stable-3000-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1299,6 +1715,19 @@ steps: - throttle-build - create +- name: Py3 3000(Git) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-git-3000-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py3 2018.3(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1325,6 +1754,19 @@ steps: - throttle-build - create +- name: Py3 3000(Stable) + image: saltstack/drone-salt-bootstrap-testing + commands: + - pip install -U pip + - pip install -r tests/requirements.txt + - bundle install --with docker --without opennebula ec2 windows vagrant + - bundle exec kitchen test py3-stable-3000-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1340,6 +1782,6 @@ depends_on: --- kind: signature -hmac: 08cacaea37ae92bd156f41af4af3c80da1f2aa535bc41a9efe2f2922c7b51e99 +hmac: e497bd1fe77cb4bf8772e1491392a73751e67feccdc7a8f40ec6e92781368def ... diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c92f9cf..f0a5643 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,6 +228,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-amazon-2 + py2-stable-3000-amazon-2: + name: Amazon 2 v3000 Py2 Stable + 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-stable-3000-amazon-2 || bundle exec kitchen create py2-stable-3000-amazon-2 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py2-stable-3000-amazon-2 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py2-stable-3000-amazon-2 + + py2-git-3000-amazon-2: name: Amazon 2 v3000 Py2 Git runs-on: ubuntu-latest @@ -274,6 +320,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-amazon-2 + py3-stable-3000-amazon-2: + name: Amazon 2 v3000 Py3 Stable + 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 py3-stable-3000-amazon-2 || bundle exec kitchen create py3-stable-3000-amazon-2 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-amazon-2 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-amazon-2 + + py3-git-3000-amazon-2: name: Amazon 2 v3000 Py3 Git runs-on: ubuntu-latest @@ -826,6 +918,52 @@ jobs: bundle exec kitchen destroy py2-git-2019-2-centos-6 + py2-stable-3000-centos-6: + name: CentOS 6 v3000 Py2 Stable + 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-stable-3000-centos-6 || bundle exec kitchen create py2-stable-3000-centos-6 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py2-stable-3000-centos-6 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py2-stable-3000-centos-6 + + py2-git-3000-centos-6: name: CentOS 6 v3000 Py2 Git runs-on: ubuntu-latest @@ -1332,6 +1470,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-centos-7 + py2-stable-3000-centos-7: + name: CentOS 7 v3000 Py2 Stable + 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-stable-3000-centos-7 || bundle exec kitchen create py2-stable-3000-centos-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py2-stable-3000-centos-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py2-stable-3000-centos-7 + + py2-git-3000-centos-7: name: CentOS 7 v3000 Py2 Git runs-on: ubuntu-latest @@ -1378,6 +1562,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-centos-7 + py3-stable-3000-centos-7: + name: CentOS 7 v3000 Py3 Stable + 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 py3-stable-3000-centos-7 || bundle exec kitchen create py3-stable-3000-centos-7 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-centos-7 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-centos-7 + + py3-git-3000-centos-7: name: CentOS 7 v3000 Py3 Git runs-on: ubuntu-latest @@ -1654,6 +1884,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-centos-8 + py3-stable-3000-centos-8: + name: CentOS 8 v3000 Py3 Stable + 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 py3-stable-3000-centos-8 || bundle exec kitchen create py3-stable-3000-centos-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-centos-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-centos-8 + + py3-git-3000-centos-8: name: CentOS 8 v3000 Py3 Git runs-on: ubuntu-latest @@ -1838,6 +2114,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-debian-10 + py3-stable-3000-debian-10: + name: Debian 10 v3000 Py3 Stable + 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 py3-stable-3000-debian-10 || bundle exec kitchen create py3-stable-3000-debian-10 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-debian-10 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-debian-10 + + py3-git-3000-debian-10: name: Debian 10 v3000 Py3 Git runs-on: ubuntu-latest @@ -2114,6 +2436,52 @@ jobs: bundle exec kitchen destroy py2-git-2019-2-debian-8 + py2-stable-3000-debian-8: + name: Debian 8 v3000 Py2 Stable + 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-stable-3000-debian-8 || bundle exec kitchen create py2-stable-3000-debian-8 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py2-stable-3000-debian-8 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py2-stable-3000-debian-8 + + py2-git-3000-debian-8: name: Debian 8 v3000 Py2 Git runs-on: ubuntu-latest @@ -2620,6 +2988,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-debian-9 + py2-stable-3000-debian-9: + name: Debian 9 v3000 Py2 Stable + 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-stable-3000-debian-9 || bundle exec kitchen create py2-stable-3000-debian-9 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py2-stable-3000-debian-9 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py2-stable-3000-debian-9 + + py2-git-3000-debian-9: name: Debian 9 v3000 Py2 Git runs-on: ubuntu-latest @@ -2666,6 +3080,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-debian-9 + py3-stable-3000-debian-9: + name: Debian 9 v3000 Py3 Stable + 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 py3-stable-3000-debian-9 || bundle exec kitchen create py3-stable-3000-debian-9 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-debian-9 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-debian-9 + + py3-git-3000-debian-9: name: Debian 9 v3000 Py3 Git runs-on: ubuntu-latest @@ -3034,6 +3494,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-fedora-30 + py3-stable-3000-fedora-30: + name: Fedora 30 v3000 Py3 Stable + 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 py3-stable-3000-fedora-30 || bundle exec kitchen create py3-stable-3000-fedora-30 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-fedora-30 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-fedora-30 + + py3-git-3000-fedora-30: name: Fedora 30 v3000 Py3 Git runs-on: ubuntu-latest @@ -3356,6 +3862,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-fedora-31 + py3-stable-3000-fedora-31: + name: Fedora 31 v3000 Py3 Stable + 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 py3-stable-3000-fedora-31 || bundle exec kitchen create py3-stable-3000-fedora-31 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-fedora-31 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-fedora-31 + + py3-git-3000-fedora-31: name: Fedora 31 v3000 Py3 Git runs-on: ubuntu-latest @@ -4322,6 +4874,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-ubuntu-1604 + py2-stable-3000-ubuntu-1604: + name: Ubuntu 16.04 v3000 Py2 Stable + 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-stable-3000-ubuntu-1604 || bundle exec kitchen create py2-stable-3000-ubuntu-1604 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py2-stable-3000-ubuntu-1604 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py2-stable-3000-ubuntu-1604 + + py2-git-3000-ubuntu-1604: name: Ubuntu 16.04 v3000 Py2 Git runs-on: ubuntu-latest @@ -4368,6 +4966,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-ubuntu-1604 + py3-stable-3000-ubuntu-1604: + name: Ubuntu 16.04 v3000 Py3 Stable + 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 py3-stable-3000-ubuntu-1604 || bundle exec kitchen create py3-stable-3000-ubuntu-1604 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-ubuntu-1604 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-ubuntu-1604 + + py3-git-3000-ubuntu-1604: name: Ubuntu 16.04 v3000 Py3 Git runs-on: ubuntu-latest @@ -4920,6 +5564,52 @@ jobs: bundle exec kitchen destroy py3-git-2019-2-ubuntu-1804 + py2-stable-3000-ubuntu-1804: + name: Ubuntu 18.04 v3000 Py2 Stable + 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-stable-3000-ubuntu-1804 || bundle exec kitchen create py2-stable-3000-ubuntu-1804 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py2-stable-3000-ubuntu-1804 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py2-stable-3000-ubuntu-1804 + + py2-git-3000-ubuntu-1804: name: Ubuntu 18.04 v3000 Py2 Git runs-on: ubuntu-latest @@ -4966,6 +5656,52 @@ jobs: bundle exec kitchen destroy py2-git-3000-ubuntu-1804 + py3-stable-3000-ubuntu-1804: + name: Ubuntu 18.04 v3000 Py3 Stable + 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 py3-stable-3000-ubuntu-1804 || bundle exec kitchen create py3-stable-3000-ubuntu-1804 + + - name: Test Bootstrap In Test Container + run: | + bundle exec kitchen verify py3-stable-3000-ubuntu-1804 + + - name: Destroy Test Container + if: always() + run: | + bundle exec kitchen destroy py3-stable-3000-ubuntu-1804 + + py3-git-3000-ubuntu-1804: name: Ubuntu 18.04 v3000 Py3 Git runs-on: ubuntu-latest diff --git a/.github/workflows/templates/generate.py b/.github/workflows/templates/generate.py index c9fda1f..44a3090 100755 --- a/.github/workflows/templates/generate.py +++ b/.github/workflows/templates/generate.py @@ -78,7 +78,6 @@ BRANCH_DISPLAY_NAMES = { } STABLE_BRANCH_BLACKLIST = [ - '3000' ] LATEST_PKG_BLACKLIST = [ diff --git a/.kitchen.yml b/.kitchen.yml index 7f75ee6..9aeec24 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -143,6 +143,16 @@ suites: - fedora-30 - fedora-31 - fedora-32 + - name: py2-stable-3000 + provisioner: + salt_version: 3000 + salt_bootstrap_options: -MP stable %s + excludes: + - arch + - opensuse-15 + - fedora-30 + - fedora-31 + - fedora-32 - name: py3-git-2018-3 provisioner: @@ -190,6 +200,16 @@ suites: - debian-8 - opensuse-15 - arch + - name: py3-stable-3000 + provisioner: + salt_version: 3000 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - opensuse-15 + - arch - name: py3-git-master provisioner: salt_version: master