From 5e51b067d1cbf5bc899c0d0d5a6e6a5511a8a3d9 Mon Sep 17 00:00:00 2001 From: ch3ll Date: Wed, 30 Oct 2019 17:01:02 -0400 Subject: [PATCH] Add python3 tests and cent8 stable --- .drone.yml | 499 +++++++++++++++++++++++++++------------------- .gitignore | 1 + .kitchen.yml | 64 ++++-- bootstrap-salt.sh | 2 +- 4 files changed, 349 insertions(+), 217 deletions(-) diff --git a/.drone.yml b/.drone.yml index e28ac1a..c9efc25 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,19 +39,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-arch - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -65,6 +52,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-arch + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -78,6 +78,20 @@ steps: - throttle-build - create +- name: Py3 2019.2(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-2019-2-arch + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -118,19 +132,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-centos-6 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -157,19 +158,6 @@ steps: - throttle-build - create -- name: Py2 2017.7(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-2017-7-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: @@ -236,19 +224,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-centos-7 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -262,6 +237,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -275,13 +263,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- name: Py3 2019.2(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-stable-2017-7-centos-7 + - bundle exec kitchen test py3-git-2019-2-centos-7 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -301,6 +289,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -314,6 +315,19 @@ steps: - throttle-build - create +- name: Py3 2019.2(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-2019-2-centos-7 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -354,19 +368,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-centos-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -380,6 +381,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -393,6 +407,45 @@ steps: - throttle-build - create +- name: Py3 2019.2(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-2019-2-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + +- name: Py2 2019.2(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-2019-2-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: + - 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-2019-2-centos-8 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -433,19 +486,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-debian-8 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -472,19 +512,6 @@ steps: - throttle-build - create -- name: Py2 2017.7(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-2017-7-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: @@ -551,19 +578,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-debian-9 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -577,6 +591,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -590,13 +617,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- name: Py3 2019.2(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-stable-2017-7-debian-9 + - bundle exec kitchen test py3-git-2019-2-debian-9 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -616,6 +643,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -629,6 +669,19 @@ steps: - throttle-build - create +- name: Py3 2019.2(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-2019-2-debian-9 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -669,19 +722,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-debian-10 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -695,6 +735,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-debian-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -708,6 +761,45 @@ steps: - throttle-build - create +- name: Py3 2019.2(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-2019-2-debian-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + +- name: Py2 2019.2(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-2019-2-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: + - 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-2019-2-debian-10 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -748,19 +840,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-fedora-29 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -827,19 +906,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-fedora-30 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -906,19 +972,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-opensuse-15 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -985,19 +1038,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-opensuse-42 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1064,19 +1104,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-ubuntu-1604 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1090,6 +1117,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1103,13 +1143,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- name: Py3 2019.2(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-stable-2017-7-ubuntu-1604 + - bundle exec kitchen test py3-git-2019-2-ubuntu-1604 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1129,6 +1169,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1142,6 +1195,19 @@ steps: - throttle-build - create +- name: Py3 2019.2(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-2019-2-ubuntu-1604 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + services: - name: docker image: saltstack/drone-salt-bootstrap-testing @@ -1182,19 +1248,6 @@ steps: depends_on: - throttle-build -- name: Py2 2017.7(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-2017-7-ubuntu-1804 - environment: - DOCKER_HOST: tcp://docker:2375 - depends_on: - - throttle-build - - create - - name: Py2 2018.3(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1208,6 +1261,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Git) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1221,13 +1287,13 @@ steps: - throttle-build - create -- name: Py2 2017.7(Stable) +- name: Py3 2019.2(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-stable-2017-7-ubuntu-1804 + - bundle exec kitchen test py3-git-2019-2-ubuntu-1804 environment: DOCKER_HOST: tcp://docker:2375 depends_on: @@ -1247,6 +1313,19 @@ steps: - throttle-build - create +- name: Py3 2018.3(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-2018-3-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + - name: Py2 2019.2(Stable) image: saltstack/drone-salt-bootstrap-testing commands: @@ -1260,6 +1339,20 @@ steps: - throttle-build - create +- name: Py3 2019.2(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-2019-2-ubuntu-1804 + environment: + DOCKER_HOST: tcp://docker:2375 + depends_on: + - throttle-build + - create + + services: - name: docker image: saltstack/drone-salt-bootstrap-testing diff --git a/.gitignore b/.gitignore index 0d8af35..48d9908 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,6 @@ .idea # test-kitchen +.kitchen .bundle Gemfile.lock diff --git a/.kitchen.yml b/.kitchen.yml index f15dca2..f8313f4 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -103,26 +103,15 @@ platforms: run_command: /lib/systemd/systemd suites: - - name: py2-git-2017-7 - provisioner: - salt_version: 2017.7 - name: py2-git-2018-3 provisioner: salt_version: 2018.3 - name: py2-git-2019-2 provisioner: salt_version: 2019.2 - - name: py2-stable-2017-7 + - name: py2-git-master provisioner: - salt_version: 2017.7 - salt_bootstrap_options: -MP stable %s - excludes: - - arch - - fedora-28 - - fedora-29 - - fedora-30 - - opensuse-15 - - opensuse-42 + salt_version: master - name: py2-stable-2018-3 provisioner: salt_version: 2018.3 @@ -145,6 +134,55 @@ suites: - fedora-30 - opensuse-15 - opensuse-42 + - name: py3-git-2018-3 + provisioner: + salt_version: 2018.3 + salt_bootstrap_options: -x python3 -MPfq git %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - name: py3-git-2019-2 + provisioner: + salt_version: 2019.2 + salt_bootstrap_options: -x python3 -MPfq git %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - name: py3-stable-2018-3 + provisioner: + salt_version: 2018.3 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - name: py3-stable-2019-2 + provisioner: + salt_version: 2019.2 + salt_bootstrap_options: -x python3 -MP stable %s + excludes: + - amazon-1 + - centos-6 + - debian-8 + - fedora-29 + - fedora-30 + - opensuse-15 + - opensuse-42 + - arch verifier: name: shell diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 64558cd..be65ccb 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -3891,7 +3891,7 @@ install_centos_git_deps() { __install_tornado_pip ${_py} || return 1 __PACKAGES="${__PACKAGES} python3-m2crypto" else - __PACKAGES="${__PACKAGES} m2crypto ${PY_PKG_VER}-crypto" + __PACKAGES="${__PACKAGES} m2crypto python${PY_PKG_VER}-crypto" fi __PACKAGES="${__PACKAGES} python${PY_PKG_VER}-jinja2"