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:
Andreas Jaeger 2019-04-20 12:11:45 +02:00
parent cae8e2bafd
commit e4769d556b
3 changed files with 10 additions and 10 deletions

View File

@ -2,7 +2,7 @@
hosts: all hosts: all
vars: vars:
destination: "/usr/zuul-env/bin/zuul-cloner" 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: roles:
- role: fetch-zuul-cloner - role: fetch-zuul-cloner
post_tasks: post_tasks:
@ -36,17 +36,17 @@
trap cleanup EXIT trap cleanup EXIT
cat > $CLONEMAP << EOF cat > $CLONEMAP << EOF
clonemap: clonemap:
- name: openstack-infra/project-config - name: openstack/project-config
dest: {{ ansible_user_dir }} dest: {{ ansible_user_dir }}
EOF EOF
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \ /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
--cache-dir /opt/git https://git.openstack.org \ --cache-dir /opt/git https://opendev.org \
openstack-infra/project-config openstack/project-config
register: clone_with_required register: clone_with_required
- name: Check if repository was cloned - name: Check if repository was cloned
stat: 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 register: with_required_stat
- name: Zuul clone something not in required-projects - name: Zuul clone something not in required-projects
@ -71,7 +71,7 @@
- name: Check if repository was cloned - name: Check if repository was cloned
stat: 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 register: without_required_stat
- name: Validate zuul-cloner shim results - name: Validate zuul-cloner shim results

View File

@ -3,13 +3,13 @@
roles: roles:
- role: use-cached-repos - role: use-cached-repos
post_tasks: 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. # Also check that the project being tested is being prepared.
# We're checking them explicitly rather than with_items on zuul.projects # We're checking them explicitly rather than with_items on zuul.projects
# in case there is a regression which would take an item out. # 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: 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 register: project_config
- name: Check this project was prepared - name: Check this project was prepared

View File

@ -10,4 +10,4 @@
hosts: all hosts: all
roles: roles:
- role: validate-host - role: validate-host
zuul_site_traceroute_host: git.openstack.org zuul_site_traceroute_host: files.openstack.org