diff --git a/test-playbooks/base-roles/fetch-zuul-cloner.yaml b/test-playbooks/base-roles/fetch-zuul-cloner.yaml index 9bdfe5817..735b74359 100644 --- a/test-playbooks/base-roles/fetch-zuul-cloner.yaml +++ b/test-playbooks/base-roles/fetch-zuul-cloner.yaml @@ -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 diff --git a/test-playbooks/base-roles/use-cached-repos.yaml b/test-playbooks/base-roles/use-cached-repos.yaml index dc0355328..143357368 100644 --- a/test-playbooks/base-roles/use-cached-repos.yaml +++ b/test-playbooks/base-roles/use-cached-repos.yaml @@ -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 diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 253b9b896..5f12cd2c9 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -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/.*