From 91a0d9b31283404d2affe0005593b9eee2680f75 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 6 Sep 2019 07:13:41 -0700 Subject: [PATCH] Update the base-roles test to use prepare-workspace-git This is what this job should have been testing, as it's what we recommend people use. We simply didn't notice that OpenDev never finished the transition away from use-cached-repos (which isn't even defined in this repo). Change-Id: I9be05f9c035441c3a0f84206b25580263663d179 --- test-playbooks/base-roles/base.yaml | 2 +- .../{use-cached-repos.yaml => prepare-workspace-git.yaml} | 4 ++-- zuul-tests.d/general-roles-jobs.yaml | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) rename test-playbooks/base-roles/{use-cached-repos.yaml => prepare-workspace-git.yaml} (90%) diff --git a/test-playbooks/base-roles/base.yaml b/test-playbooks/base-roles/base.yaml index 466a793fa..346d84e0b 100644 --- a/test-playbooks/base-roles/base.yaml +++ b/test-playbooks/base-roles/base.yaml @@ -6,7 +6,7 @@ # Note: set-zuul-log-path-fact is tested by emit-job-header.yaml - include: emit-job-header.yaml - include: ensure-output-dirs.yaml -- include: use-cached-repos.yaml +- include: prepare-workspace-git.yaml - include: configure-mirrors.yaml - include: fetch-zuul-cloner.yaml - include: validate-host.yaml diff --git a/test-playbooks/base-roles/use-cached-repos.yaml b/test-playbooks/base-roles/prepare-workspace-git.yaml similarity index 90% rename from test-playbooks/base-roles/use-cached-repos.yaml rename to test-playbooks/base-roles/prepare-workspace-git.yaml index 143357368..6a83cfbdc 100644 --- a/test-playbooks/base-roles/use-cached-repos.yaml +++ b/test-playbooks/base-roles/prepare-workspace-git.yaml @@ -1,7 +1,7 @@ -- name: Test the use-cached-repos role +- name: Test the prepare-workspace-git role hosts: all roles: - - role: use-cached-repos + - role: prepare-workspace-git post_tasks: # opendev/base-jobs is in 'required-projects'. # Also check that the project being tested is being prepared. diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 8bc94a9e9..d1acaf047 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -113,14 +113,13 @@ required-projects: - opendev/base-jobs files: - - ^roles/configure-mirrors/.* - ^roles/configure-mirrors/.* - ^roles/emit-job-header/.* - ^roles/ensure-output-dirs/.* - ^roles/fetch-output/.* - ^roles/fetch-zuul-cloner/.* - ^roles/set-zuul-log-path-fact/.* - - ^roles/use-cached-repo/.* + - ^roles/prepare-workspace-git/.* - ^roles/validate-host/.* - ^test-playbooks/base-roles/.*