From 071942061d86054470344c6bfefe80ce35fa0086 Mon Sep 17 00:00:00 2001
From: Imran Iqbal <iqbalmy@hotmail.com>
Date: Fri, 19 Apr 2019 19:03:54 +0100
Subject: [PATCH] ci(kitchen+travis): use `py2` instead of `py3` for `centos-7`

---
 .travis.yml | 2 +-
 kitchen.yml | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8d362fe..e5306e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
   matrix:
     - INSTANCE: v2019-2-py3-debian-9
     - INSTANCE: v2019-2-py3-ubuntu-1804
-    - INSTANCE: v2019-2-py3-centos-7
+    - INSTANCE: v2019-2-py2-centos-7
     - INSTANCE: v2019-2-py2-fedora-29
 
     - INSTANCE: v2018-3-py2-debian-8
diff --git a/kitchen.yml b/kitchen.yml
index 61afc15..72b042c 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -83,14 +83,7 @@ suites:
     includes:
       - debian-9
       - ubuntu-18.04
-      - centos-7
     provisioner:
-      # If we don't force bootstrapping with python3, centos bootstraps using python2
-      # and then, when switching the repo to python3 and tries to install
-      # the packages, complains with
-      # Downloading packages:
-      #   https://repo.saltstack.com/py3/re.........rpm: [Errno -1] Package does not
-      # match intended download. Suggestion: run yum --enablerepo=saltstack clean metadata
       salt_bootstrap_options: -X -x python3 -d git %s
       salt_version: '2019.2'
       pillars:
@@ -107,6 +100,7 @@ suites:
   # Fedora ships updated py2 versions in their own repos
   - name: v2019-2-py2
     includes:
+      - centos-7
       - fedora-29
     provisioner:
       salt_version: '2019.2'