Switch back to master

We've delete feature/zuulv3 and merge back to master! However, because
centos-7 doesn't support python3 we also have to drop testing it for
now too.

Stop running windmill jobs, so we can land these changes.

Change-Id: I3510c2317e07f9088a4ef9b95a4b43ec96dafb56
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-01-18 20:49:34 -05:00
parent 6757bae61f
commit 8dc3280328
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 1 additions and 11 deletions

View File

@ -7,11 +7,6 @@
roles:
- zuul: openstack/ansible-role-nodepool
- job:
name: ansible-role-nodepool-centos-7
parent: ansible-role-nodepool
nodeset: centos-7
- job:
name: ansible-role-nodepool-fedora-26
parent: ansible-role-nodepool
@ -24,18 +19,13 @@
- project:
name: openstack/ansible-role-nodepool
templates:
- windmill-jobs-fedora-26
- windmill-jobs-xenial
check:
jobs:
- ansible-role-nodepool-centos-7
- ansible-role-nodepool-fedora-26
- ansible-role-nodepool-ubuntu-xenial
- tox-linters
gate:
jobs:
- ansible-role-nodepool-centos-7
- ansible-role-nodepool-fedora-26
- ansible-role-nodepool-ubuntu-xenial
- tox-linters

View File

@ -57,7 +57,7 @@ nodepool_file_launcher_logging_conf_src: etc/nodepool/launcher-logging.conf
# tasks/install.yaml
nodepool_git_dest: /opt/ansible-role-nodepool/git/openstack-infra/nodepool
nodepool_git_uri: https://git.openstack.org/openstack-infra/nodepool
nodepool_git_version: feature/zuulv3
nodepool_git_version: master
# nodepool_git_refspec:
# nodepool_git_update: