From 62651419f084941659f95fb8b1b4a71f363b5032 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 16 Jun 2020 14:41:09 +0100
Subject: [PATCH] CI: multiple fixes

1. Install python setuptools & virtualenv

These are no longer installed in the nodepool image provided by infra.

2. Override requirements branch to stable/train in Zuul jobs

Train is the last release to support Python 2.

Change-Id: I2557b1c9cedc92ece1ce94c148f84cc3bbbd0d5b
---
 roles/tenks-ci-prep/tasks/main.yml | 27 +++++++++++++++++++++++++++
 zuul.d/jobs.yaml                   |  3 +++
 zuul.d/project.yaml                | 22 ++++++++++++++++++++--
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/roles/tenks-ci-prep/tasks/main.yml b/roles/tenks-ci-prep/tasks/main.yml
index 845124d..e9967ce 100644
--- a/roles/tenks-ci-prep/tasks/main.yml
+++ b/roles/tenks-ci-prep/tasks/main.yml
@@ -12,3 +12,30 @@
       command: yum-config-manager --enable epel
   when: ansible_os_family == 'RedHat'
   become: true
+
+- name: Install Python2 modules
+  become: true
+  package:
+    name:
+      - python-pip
+      - python-setuptools
+      - python-virtualenv
+      - python-wheel
+  when: ansible_os_family == 'RedHat'
+
+- name: Install Python3 modules
+  become: true
+  package:
+    name:
+      - python3-pip
+      - python3-setuptools
+      - python3-virtualenv
+      - python3-wheel
+      - virtualenv
+  when: ansible_os_family == 'Debian'
+
+- name: Ensure latest pip is installed
+  become: true
+  pip:
+    name: pip
+    state: latest
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2dea668..44ec385 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -6,6 +6,9 @@
     parent: openstack-tox
     vars:
       tox_envlist: alint
+    required-projects:
+      - name: openstack/requirements
+        override-checkout: stable/train
 
 - job:
     name: tenks-deploy-teardown-centos
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index c033b13..8433565 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -1,14 +1,24 @@
 ---
 - project:
     templates:
-      - openstack-cover-jobs
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
 
     check:
       jobs:
+        - openstack-tox-cover:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/train
+        - openstack-tox-pep8:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/train
+        - openstack-tox-py27:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/train
         - tenks-tox-ansible-lint
         - tenks-deploy-teardown-centos
         - tenks-deploy-teardown-ubuntu
@@ -19,6 +29,14 @@
     gate:
       queue: tenks
       jobs:
+        - openstack-tox-pep8:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/train
+        - openstack-tox-py27:
+            required-projects:
+              - name: openstack/requirements
+                override-checkout: stable/train
         - tenks-tox-ansible-lint
         - tenks-deploy-teardown-centos
         - tenks-deploy-teardown-ubuntu