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:
parent
42b729d2d4
commit
45f94b1157
|
@ -3,7 +3,6 @@
|
||||||
run: tests/test.yaml
|
run: tests/test.yaml
|
||||||
required-projects:
|
required-projects:
|
||||||
- name: openstack-infra/zuul
|
- name: openstack-infra/zuul
|
||||||
override-branch: feature/zuulv3
|
|
||||||
roles:
|
roles:
|
||||||
- zuul: openstack/ansible-role-zuul
|
- zuul: openstack/ansible-role-zuul
|
||||||
|
|
||||||
|
@ -19,9 +18,6 @@
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
name: openstack/ansible-role-zuul
|
name: openstack/ansible-role-zuul
|
||||||
templates:
|
|
||||||
- windmill-jobs-fedora-26
|
|
||||||
- windmill-jobs-xenial
|
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- ansible-role-zuul-fedora-26
|
- ansible-role-zuul-fedora-26
|
||||||
|
|
|
@ -63,7 +63,7 @@ zuul_file_zuul_conf_src: etc/zuul/zuul.conf
|
||||||
# tasks/install.yaml
|
# tasks/install.yaml
|
||||||
zuul_git_dest: /opt/ansible-role-zuul/git/openstack-infra/zuul
|
zuul_git_dest: /opt/ansible-role-zuul/git/openstack-infra/zuul
|
||||||
zuul_git_uri: https://git.openstack.org/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_git_update:
|
||||||
|
|
||||||
zuul_install_method: git
|
zuul_install_method: git
|
||||||
|
|
Loading…
Reference in New Issue