OpenDev changes
Use files.openstack.org instead of git.openstack.org for traceroute test. Update use-cached-repos tests to use new orgs. Update fetch-zuul-cloner to use opendev.org as path, fix a typo. Continue to use the legacy names since fetch-zuul-cloner is a legacy tool. Change-Id: Ia57bda9e6a36e3c98a28382c19703bc01fa8e8d9
This commit is contained in:
parent
cae8e2bafd
commit
e4769d556b
@ -2,7 +2,7 @@
|
||||
hosts: all
|
||||
vars:
|
||||
destination: "/usr/zuul-env/bin/zuul-cloner"
|
||||
repo_src_dir: "/home/zuul/src/git.openstack.org"
|
||||
repo_src_dir: "/home/zuul/src/opendev.org"
|
||||
roles:
|
||||
- role: fetch-zuul-cloner
|
||||
post_tasks:
|
||||
@ -36,17 +36,17 @@
|
||||
trap cleanup EXIT
|
||||
cat > $CLONEMAP << EOF
|
||||
clonemap:
|
||||
- name: openstack-infra/project-config
|
||||
- name: openstack/project-config
|
||||
dest: {{ ansible_user_dir }}
|
||||
EOF
|
||||
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
|
||||
--cache-dir /opt/git https://git.openstack.org \
|
||||
openstack-infra/project-config
|
||||
--cache-dir /opt/git https://opendev.org \
|
||||
openstack/project-config
|
||||
register: clone_with_required
|
||||
|
||||
- name: Check if repository was cloned
|
||||
stat:
|
||||
path: "{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/project-config"
|
||||
path: "{{ ansible_user_dir }}/src/opendev.org/openstack/project-config"
|
||||
register: with_required_stat
|
||||
|
||||
- name: Zuul clone something not in required-projects
|
||||
@ -71,7 +71,7 @@
|
||||
|
||||
- name: Check if repository was cloned
|
||||
stat:
|
||||
path: "{{ ansible_user_dir }}/src/git.openstack.org/opentack-infra/jenkins-job-builder"
|
||||
path: "{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/jenkins-job-builder"
|
||||
register: without_required_stat
|
||||
|
||||
- name: Validate zuul-cloner shim results
|
||||
|
@ -3,13 +3,13 @@
|
||||
roles:
|
||||
- role: use-cached-repos
|
||||
post_tasks:
|
||||
# openstack-infra/project-config is in 'required-projects'.
|
||||
# openstack/project-config is in 'required-projects'.
|
||||
# Also check that the project being tested is being prepared.
|
||||
# We're checking them explicitly rather than with_items on zuul.projects
|
||||
# in case there is a regression which would take an item out.
|
||||
- name: Check that openstack-infra/project-config was prepared
|
||||
- name: Check that openstack/project-config was prepared
|
||||
stat:
|
||||
path: "{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/project-config"
|
||||
path: "{{ ansible_user_dir }}/src/opendev.org/openstack/project-config"
|
||||
register: project_config
|
||||
|
||||
- name: Check this project was prepared
|
||||
|
@ -10,4 +10,4 @@
|
||||
hosts: all
|
||||
roles:
|
||||
- role: validate-host
|
||||
zuul_site_traceroute_host: git.openstack.org
|
||||
zuul_site_traceroute_host: files.openstack.org
|
||||
|
Loading…
Reference in New Issue
Block a user