From aef89acf21f8e181e5612321e2690125d244224d Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 11 Apr 2023 11:27:36 +0200 Subject: [PATCH] Install zuul-provided collections as directories At the moment we don't really use collection version that is provided by depends-on. This results in testing different content that should be. Presumably, this happens because ansible-galaxy does install from default branch HEAD, while zuul does check-out to refs when using depends-on. To ensure that git repo state is not the issue, we switch type to be directory for collections that are contained in Zuul. Change-Id: I7a0e2f7702a9f8630ed916523b9f0e6c2bbc202b --- scripts/get-ansible-collection-requirements.yml | 5 ++--- scripts/upgrade-utilities/unset-ansible-env.rc | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/get-ansible-collection-requirements.yml b/scripts/get-ansible-collection-requirements.yml index 664420a3c9..70b9bd6a0a 100644 --- a/scripts/get-ansible-collection-requirements.yml +++ b/scripts/get-ansible-collection-requirements.yml @@ -60,9 +60,8 @@ vars: zuul_item: name: "{{ item.item.name }}" - source: "git+file://{{ zuul_src_path }}/{{ item.item.source.split('/')[-3:] | join('/') }}" - version: "{{ item.item.version }}" - type: "{{ item.item.type | default('') }}" + source: "{{ zuul_src_path }}/{{ item.item.source.split('/')[-3:] | join('/') }}" + type: "dir" set_fact: galaxy_collections_list_ci: "{{ galaxy_collections_list_ci | default([]) + [ (item.stat.exists | ternary(zuul_item, item.item)) ] }}" with_items: "{{ zuul_collections.results }}" diff --git a/scripts/upgrade-utilities/unset-ansible-env.rc b/scripts/upgrade-utilities/unset-ansible-env.rc index ea039ab190..59927bdf8d 100644 --- a/scripts/upgrade-utilities/unset-ansible-env.rc +++ b/scripts/upgrade-utilities/unset-ansible-env.rc @@ -3,5 +3,6 @@ unset ANSIBLE_FILTER_PLUGINS unset ANSIBLE_ACTION_PLUGINS unset ANSIBLE_CALLBACK_PLUGINS unset ANSIBLE_TRANSPORT +unset ANSIBLE_STRATEGY unset ANSIBLE_STRATEGY_PLUGINS unset ANSIBLE_CONNECTION_PLUGINS