From 8dc32803284a4a019098c00d901c4b74cb89830f Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 18 Jan 2018 20:49:34 -0500 Subject: [PATCH] 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 --- .zuul.yaml | 10 ---------- defaults/main.yaml | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 1bc87e1..856b1e2 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -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 diff --git a/defaults/main.yaml b/defaults/main.yaml index 97c6877..13e2874 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -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: