Switch back to master branch

Now that feature/zuulv3 has been merged into master, we can also
switch back for testing.

Disable windmill jobs, until all roles have been switched back to
master.

Change-Id: I05b5a2dce7d943d334baf24de684a13e54cde63e
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2018-02-04 13:38:51 -05:00
parent 42b729d2d4
commit 45f94b1157
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 1 additions and 5 deletions

View File

@ -3,7 +3,6 @@
run: tests/test.yaml
required-projects:
- name: openstack-infra/zuul
override-branch: feature/zuulv3
roles:
- zuul: openstack/ansible-role-zuul
@ -19,9 +18,6 @@
- project:
name: openstack/ansible-role-zuul
templates:
- windmill-jobs-fedora-26
- windmill-jobs-xenial
check:
jobs:
- ansible-role-zuul-fedora-26

View File

@ -63,7 +63,7 @@ zuul_file_zuul_conf_src: etc/zuul/zuul.conf
# tasks/install.yaml
zuul_git_dest: /opt/ansible-role-zuul/git/openstack-infra/zuul
zuul_git_uri: https://git.openstack.org/openstack-infra/zuul
zuul_git_version: feature/zuulv3
zuul_git_version: master
# zuul_git_update:
zuul_install_method: git