Merge "Always use on-disk openstack service git repos in CI jobs"

scripts/get-ansible-role-requirements.yml

@@ -97,15 +97,10 @@
             path: "{{ config_dir }}"
             state: directory
 
-        - name: Create override for zuul git server to local repos
-          copy:
-            content: |
-              openstack_opendev_base_url: "file:///openstack/src/opendev.org"
-            dest: "{{ config_dir }}/user_variables_zuulrepos.yml"
-
       when:
         - "lookup('env', 'ZUUL_SRC_PATH') != ''"
         - "lookup('env', 'UPGRADE_TARGET_BRANCH') == ''"
+
     - name: Generate a list of user overridden roles
       set_fact:
         user_overridden_roles: "{{ user_roles | json_query('[*].name') }}"

tests/roles/bootstrap-host/tasks/main.yml

@@ -71,11 +71,20 @@
 
 # Symlink host repos to /openstack/src to match the lxc continer bind mount
 # NOTE(jrosser) this must happen *after* prepare_data_disk as /openstack may remounted
-- name: Symlink /openstack/src to /home/zuul/src
-  file:
-    src: "{{ lookup('env', 'ZUUL_SRC_PATH') }}"
-    dest: '/openstack/src'
-    state: link
+- name: Use on-disk repos for openstack services in CI
+  block:
+    - name: Symlink /openstack/src to /home/zuul/src
+      file:
+        src: "{{ lookup('env', 'ZUUL_SRC_PATH') }}"
+        dest: '/openstack/src'
+        state: link
+
+    - name: Create override for zuul git server to local repos
+      copy:
+        content: |
+          openstack_opendev_base_url: "file:///openstack/src/opendev.org"
+        dest: "/etc/openstack_deploy/user_variables_zuulrepos.yml"
+
   when:
     - "lookup('env', 'ZUUL_SRC_PATH') | length > 0"