From 188e42dd995e271762008a3c481471b54686ff50 Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Tue, 17 Nov 2020 15:09:39 +0530 Subject: [PATCH] Fixed data_files In order to package ansible-role-collect-logs, we need to put the roles under /usr/share not in /usr/local/share so that system ansible discovers this role. Remove setup.cfg file from irrelevant files to avoid job freeze. Change-Id: Ifbc7cec6daa24c317636406100ca8cd860165ffd Signed-off-by: Chandan Kumar (raukadah) --- setup.cfg | 22 +++++++++++----------- zuul.d/layout.yaml | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3e0f8ac..7bc042f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,17 +20,17 @@ setup-hooks = [files] data_files = - usr/local/share/ansible/roles/collect-logs/defaults = defaults/* - usr/local/share/ansible/roles/collect-logs/meta = meta/* - usr/local/share/ansible/roles/collect-logs/tasks = tasks/* - usr/local/share/ansible/roles/collect-logs/templates = templates/* - usr/local/share/ansible/roles/collect-logs/files = files/* - usr/local/share/ansible/roles/collect-logs/filter_plugins = filter_plugins/* - usr/local/share/ansible/roles/collect-logs/library = library/* - usr/local/share/ansible/roles/collect-logs/module_utils = module_utils/* - usr/local/share/ansible/roles/collect-logs/vars = vars/* - usr/local/share/ansible/roles/collect-logs/scripts = scripts/* - usr/local/share/ansible/roles/collect-logs/docs = docs/* + share/ansible/roles/collect-logs/defaults = defaults/* + share/ansible/roles/collect-logs/meta = meta/* + share/ansible/roles/collect-logs/tasks = tasks/* + share/ansible/roles/collect-logs/templates = templates/* + share/ansible/roles/collect-logs/files = files/* + share/ansible/roles/collect-logs/filter_plugins = filter_plugins/* + share/ansible/roles/collect-logs/library = library/* + share/ansible/roles/collect-logs/module_utils = module_utils/* + share/ansible/roles/collect-logs/vars = vars/* + share/ansible/roles/collect-logs/scripts = scripts/* + share/ansible/roles/collect-logs/docs = docs/* [wheel] universal = 1 diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml index 4fcc5e2..496824c 100644 --- a/zuul.d/layout.yaml +++ b/zuul.d/layout.yaml @@ -39,7 +39,6 @@ - ^spec/.*$ - ^Puppetfile.*$ - tox.ini - - ^setup.*$ - ^vars/sova-patterns.yml$ - ^.ansible-lint$ - ^.pre-commit-config.yaml$