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
This commit is contained in:
Mark Goddard 2020-06-16 14:41:09 +01:00
parent 9bf85a5e9e
commit 62651419f0
3 changed files with 50 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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