Change the repo used in some base-roles tests

The fetch-zuul-cloner and use-cached-repos roles rely on an
unrelated repo appearing in required-projects.  To allow us to
move this repo to the Zuul tenant, change that to
opendev/base-jobs, a repo which will appear in both the current
and future tenants.

Change-Id: I06703638b69d94531ad396224669980db9ababd4
This commit is contained in:
James E. Blair 2019-07-08 07:16:12 -07:00
parent 87d597343f
commit 2cece282cc
3 changed files with 9 additions and 9 deletions

View File

@ -36,17 +36,17 @@
trap cleanup EXIT
cat > $CLONEMAP << EOF
clonemap:
- name: openstack/project-config
- name: opendev/base-jobs
dest: {{ ansible_user_dir }}
EOF
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP \
--cache-dir /opt/git https://opendev.org \
openstack/project-config
opendev/base-jobs
register: clone_with_required
- name: Check if repository was cloned
stat:
path: "{{ ansible_user_dir }}/src/opendev.org/openstack/project-config"
path: "{{ ansible_user_dir }}/src/opendev.org/opendev/base-jobs"
register: with_required_stat
- name: Zuul clone something not in required-projects

View File

@ -3,14 +3,14 @@
roles:
- role: use-cached-repos
post_tasks:
# openstack/project-config is in 'required-projects'.
# opendev/base-jobs 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/project-config was prepared
- name: Check that opendev/base-jobs was prepared
stat:
path: "{{ ansible_user_dir }}/src/opendev.org/openstack/project-config"
register: project_config
path: "{{ ansible_user_dir }}/src/opendev.org/opendev/base-jobs"
register: base_jobs
- name: Check this project was prepared
stat:
@ -20,5 +20,5 @@
- name: Validate that required projects have been prepared
assert:
that:
- project_config.stat.exists
- base_jobs.stat.exists
- self_config.stat.exists

View File

@ -14,7 +14,7 @@
# Testing of fetch-zuul-cloner and use-cached-repos need this repo
# in required-projects
required-projects:
- openstack/project-config
- opendev/base-jobs
files:
- ^roles/configure-mirrors/.*
- ^roles/configure-mirrors/.*