From 016e961890396792924d5ed13869cc27e870f86d Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 21 Sep 2020 13:05:29 +1000 Subject: [PATCH] install-ansible: fix collections install for devel job This wasn't quite fixed right when these were moved into project-config. Get the projects and install them. Change-Id: I0f854609fc9aebffc1fa2a2e14d5231cce9b71d0 --- .../install-ansible/tasks/install_ansible_collection.yaml | 6 +++--- zuul.d/system-config-run.yaml | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml b/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml index f7b79073e1..a1f855f770 100644 --- a/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml +++ b/playbooks/roles/install-ansible/tasks/install_ansible_collection.yaml @@ -1,11 +1,11 @@ -- name: 'Ensure {{ item.namespace }}/{{ item.name }} directory' +- name: 'Ensure {{ item.namespace }} top-level directory' file: - path: '/root/.ansible/collections/ansible_collections/{{ item.namespace }}/{{ item.name }}' + path: '/root/.ansible/collections/ansible_collections/{{ item.namespace }}/' state: directory mode: 0755 - name: 'Link in {{ item.namespace }}/{{ item.name }} collection' file: - src: '{{ ansible_user_dir}}/src/github.com/{{repo}}' + src: '{{ ansible_user_dir}}/src/github.com/{{ item.repo }}' dest: '/root/.ansible/collections/ansible_collections/{{ item.namespace }}/{{ item.name }}' state: link diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 8cb8205b5b..ee27e3d790 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -81,6 +81,14 @@ # NOTE(ianw): 2019-06-11 pinned to stable branch until we handle 1.0 # http://lists.openstack.org/pipermail/openstack-infra/2019-June/006400.html override-checkout: stable/0.x + - name: github.com/ansible-collections/ansible.posix + override-checkout: main + - name: github.com/ansible-collections/ansible.netcommon + override-checkout: main + - name: github.com/ansible-collections/community.crypto + override-checkout: main + - name: github.com/ansible-collections/community.general + override-checkout: main vars: bridge_ansible_name: '{{ ansible_user_dir}}/src/github.com/ansible/ansible' bridge_ansible_version: null