Consume validate_host parameters from site-variables

The settings are in the site-variables.yaml file, we don't need to
provide them in the job anymore.

Also, move validate-host earlier so that we collect the generated
inventory file and check network connectivity before we attempt to push
git repos over the wire.

Depends-On: I632a32fdfac4bfe57eb269ac8e183fb8df34d48f
Change-Id: I1131eb47f836f8c86b7e9e6329199612243873aa
This commit is contained in:
Monty Taylor 2017-09-06 07:05:05 -05:00
parent 08e4d764d8
commit b43dd1d25c
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 4 additions and 14 deletions

View File

@ -2,14 +2,10 @@
roles:
- add-build-sshkey
- start-zuul-console
- validate-host
- use-cached-repos
- mirror-workspace-git-repos
- role: validate-host
# TODO(mordred) When we have site-local variables, these should go there
zuul_traceroute_host: git.openstack.org
zuul_image_manifest: /etc/dib-builddate.txt
- role: configure-mirrors
mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
- configure-mirrors
- role: fetch-zuul-cloner
destination: "/usr/zuul-env/bin/zuul-cloner"
repo_src_dir: "~/src/git.openstack.org"

View File

@ -2,14 +2,10 @@
roles:
- add-build-sshkey
- start-zuul-console
- validate-host
- use-cached-repos
- mirror-workspace-git-repos
- role: validate-host
# TODO(mordred) When we have site-local variables, these should go there
zuul_traceroute_host: git.openstack.org
zuul_image_manifest: /etc/dib-builddate.txt
- role: configure-mirrors
mirror_fqdn: "{{ zuul_site_mirror_fqdn }}"
- configure-mirrors
- role: fetch-zuul-cloner
destination: "/usr/zuul-env/bin/zuul-cloner"
repo_src_dir: "~/src/git.openstack.org"

View File

@ -3,7 +3,5 @@
- role: bindep
bindep_profile: test
bindep_dir: "src/{{ zuul.project.canonical_name }}"
bindep_command: /usr/bindep-env/bin/bindep
bindep_fallback: /usr/local/jenkins/common_data/bindep-fallback.txt
- ensure-tox
- revoke-sudo