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:
parent
08e4d764d8
commit
b43dd1d25c
@ -2,14 +2,10 @@
|
|||||||
roles:
|
roles:
|
||||||
- add-build-sshkey
|
- add-build-sshkey
|
||||||
- start-zuul-console
|
- start-zuul-console
|
||||||
|
- validate-host
|
||||||
- use-cached-repos
|
- use-cached-repos
|
||||||
- mirror-workspace-git-repos
|
- mirror-workspace-git-repos
|
||||||
- role: validate-host
|
- configure-mirrors
|
||||||
# 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 }}"
|
|
||||||
- role: fetch-zuul-cloner
|
- role: fetch-zuul-cloner
|
||||||
destination: "/usr/zuul-env/bin/zuul-cloner"
|
destination: "/usr/zuul-env/bin/zuul-cloner"
|
||||||
repo_src_dir: "~/src/git.openstack.org"
|
repo_src_dir: "~/src/git.openstack.org"
|
||||||
|
@ -2,14 +2,10 @@
|
|||||||
roles:
|
roles:
|
||||||
- add-build-sshkey
|
- add-build-sshkey
|
||||||
- start-zuul-console
|
- start-zuul-console
|
||||||
|
- validate-host
|
||||||
- use-cached-repos
|
- use-cached-repos
|
||||||
- mirror-workspace-git-repos
|
- mirror-workspace-git-repos
|
||||||
- role: validate-host
|
- configure-mirrors
|
||||||
# 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 }}"
|
|
||||||
- role: fetch-zuul-cloner
|
- role: fetch-zuul-cloner
|
||||||
destination: "/usr/zuul-env/bin/zuul-cloner"
|
destination: "/usr/zuul-env/bin/zuul-cloner"
|
||||||
repo_src_dir: "~/src/git.openstack.org"
|
repo_src_dir: "~/src/git.openstack.org"
|
||||||
|
@ -3,7 +3,5 @@
|
|||||||
- role: bindep
|
- role: bindep
|
||||||
bindep_profile: test
|
bindep_profile: test
|
||||||
bindep_dir: "src/{{ zuul.project.canonical_name }}"
|
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
|
- ensure-tox
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
|
Loading…
Reference in New Issue
Block a user