From 6f365cefa58e473a233b3524589f7b3f07d47846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 27 Nov 2018 09:12:56 +0100 Subject: [PATCH] retrace: allow more urls for "faf repoadd" this will allows us to add two urls just after forking: one with prerelease url, and one with final one when the release of Fedora happens FAF will automagically start using the correct one as FAF ignore the url which does not work/exists --- .../host_vars/retrace01.qa.fedoraproject.org | 84 +++++++++---------- roles/abrt/faf-local-post/tasks/main.yml | 2 +- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/inventory/host_vars/retrace01.qa.fedoraproject.org b/inventory/host_vars/retrace01.qa.fedoraproject.org index 33a275a1c6..82b1bb31ae 100644 --- a/inventory/host_vars/retrace01.qa.fedoraproject.org +++ b/inventory/host_vars/retrace01.qa.fedoraproject.org @@ -22,212 +22,212 @@ sar_output_file: faf.json faf_repos: - { name: 'fedora-28-updates-testing-source', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/SRPMS/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/SRPMS/'], arch: 'src', opsys: 'Fedora 28' } - { name: 'fedora-28-updates-source', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/SRPMS/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/SRPMS/'], arch: 'src', opsys: 'Fedora 28' } - { name: 'fedora-28-armhfp-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/armhfp/debug/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/armhfp/debug/tree/'], arch: 'armv7hl', opsys: 'Fedora 28', } - { name: 'fedora-28-armhfp-testing-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/armhfp/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/armhfp/debug/'], arch: 'armv7hl', opsys: 'Fedora 28', } - { name: 'fedora-28-armhfp-testing', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/armhfp/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/armhfp/'], arch: 'armv7hl', opsys: 'Fedora 28', } - { name: 'fedora-28-armhfp-updates-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/armhfp/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/armhfp/debug/'], arch: 'armv7hl', opsys: 'Fedora 28', } - { name: 'fedora-28-armhfp-updates', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/armhfp/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/armhfp/'], arch: 'armv7hl', opsys: 'Fedora 28', } - { name: 'fedora-28-armhfp', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/armhfp/os/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/armhfp/os/'], arch: 'armv7hl', opsys: 'Fedora 28', } - { name: 'fedora-28-i386-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386/debug/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386/debug/tree/'], arch: 'i386', opsys: 'Fedora 28', } - { name: 'fedora-28-i386-testing-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/28/Everything/i386/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/28/Everything/i386/debug/'], arch: 'i386', opsys: 'Fedora 28', } - { name: 'fedora-28-i386-testing', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/28/Everything/i386/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/28/Everything/i386/'], arch: 'i386', opsys: 'Fedora 28', } - { name: 'fedora-28-i386-updates-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/28/Everything/i386/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/28/Everything/i386/debug/'], arch: 'i386', opsys: 'Fedora 28', } - { name: 'fedora-28-i386-updates', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/28/Everything/i386/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/28/Everything/i386/'], arch: 'i386', opsys: 'Fedora 28', } - { name: 'fedora-28-i386', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386/os/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/releases/28/Everything/i386/os/'], arch: 'i386', opsys: 'Fedora 28', } - { name: 'fedora-28-source', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/source/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/source/tree/'], arch: 'src', opsys: 'Fedora 28', } - { name: 'fedora-28-x86_64', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/os/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/os/'], arch: 'x86_64', opsys: 'Fedora 28', } - { name: 'fedora-28-x86_64-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/debug/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/releases/28/Everything/x86_64/debug/tree/'], arch: 'x86_64', opsys: 'Fedora 28', } - { name: 'fedora-28-x86_64-testing-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/x86_64/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/x86_64/debug/'], arch: 'x86_64', opsys: 'Fedora 28', } - { name: 'fedora-28-x86_64-testing', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/x86_64/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/28/Everything/x86_64/'], arch: 'x86_64', opsys: 'Fedora 28', } - { name: 'fedora-28-x86_64-updates-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/debug/'], arch: 'x86_64', opsys: 'Fedora 28', } - { name: 'fedora-28-x86_64-updates', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/28/Everything/x86_64/'], arch: 'x86_64', opsys: 'Fedora 28', } - { name: 'fedora-29-updates-testing-source', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/SRPMS/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/SRPMS/'], arch: 'src', opsys: 'Fedora 29' } - { name: 'fedora-29-updates-source', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/SRPMS/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/SRPMS/'], arch: 'src', opsys: 'Fedora 29' } - { name: 'fedora-29-armhfp-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/armhfp/debug/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/armhfp/debug/tree/'], arch: 'armv7hl', opsys: 'Fedora 29', } - { name: 'fedora-29-armhfp-testing-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/armhfp/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/armhfp/debug/'], arch: 'armv7hl', opsys: 'Fedora 29', } - { name: 'fedora-29-armhfp-testing', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/armhfp/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/armhfp/'], arch: 'armv7hl', opsys: 'Fedora 29', } - { name: 'fedora-29-armhfp-updates-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/armhfp/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/armhfp/debug/'], arch: 'armv7hl', opsys: 'Fedora 29', } - { name: 'fedora-29-armhfp-updates', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/armhfp/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/armhfp/'], arch: 'armv7hl', opsys: 'Fedora 29', } - { name: 'fedora-29-armhfp', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/armhfp/os/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/armhfp/os/'], arch: 'armv7hl', opsys: 'Fedora 29', } - { name: 'fedora-29-i386-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/development/29/Everything/i386/debug/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/development/29/Everything/i386/debug/tree/'], arch: 'i386', opsys: 'Fedora 29', } - { name: 'fedora-29-i386-testing-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/29/Everything/i386/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/29/Everything/i386/debug/'], arch: 'i386', opsys: 'Fedora 29', } - { name: 'fedora-29-i386-testing', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/29/Everything/i386/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/testing/29/Everything/i386/'], arch: 'i386', opsys: 'Fedora 29', } - { name: 'fedora-29-i386-updates-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/29/Everything/i386/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/29/Everything/i386/debug/'], arch: 'i386', opsys: 'Fedora 29', } - { name: 'fedora-29-i386-updates', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/29/Everything/i386/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/updates/29/Everything/i386/'], arch: 'i386', opsys: 'Fedora 29', } - { name: 'fedora-29-i386', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora-secondary/development/29/Everything/i386/os/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora-secondary/development/29/Everything/i386/os/'], arch: 'i386', opsys: 'Fedora 29', } - { name: 'fedora-29-source', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/source/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/source/tree/'], arch: 'src', opsys: 'Fedora 29', } - { name: 'fedora-29-x86_64', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/x86_64/os/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/x86_64/os/'], arch: 'x86_64', opsys: 'Fedora 29', } - { name: 'fedora-29-x86_64-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/x86_64/debug/tree/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/development/29/Everything/x86_64/debug/tree/'], arch: 'x86_64', opsys: 'Fedora 29', } - { name: 'fedora-29-x86_64-testing-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/x86_64/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/x86_64/debug/'], arch: 'x86_64', opsys: 'Fedora 29', } - { name: 'fedora-29-x86_64-testing', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/x86_64/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/testing/29/Everything/x86_64/'], arch: 'x86_64', opsys: 'Fedora 29', } - { name: 'fedora-29-x86_64-updates-debug', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/x86_64/debug/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/x86_64/debug/'], arch: 'x86_64', opsys: 'Fedora 29', } - { name: 'fedora-29-x86_64-updates', - url: 'http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/x86_64/', + url: ['http://download01.phx2.fedoraproject.org/pub/fedora/linux/updates/29/Everything/x86_64/'], arch: 'x86_64', opsys: 'Fedora 29', } diff --git a/roles/abrt/faf-local-post/tasks/main.yml b/roles/abrt/faf-local-post/tasks/main.yml index 6551bbdb76..8e15254c23 100644 --- a/roles/abrt/faf-local-post/tasks/main.yml +++ b/roles/abrt/faf-local-post/tasks/main.yml @@ -1,7 +1,7 @@ --- # the magic with ! is that it return exit code 1 if 'already defined' is not present in output - name: add repositories - shell: ! faf repoadd --nogpgcheck "{{ item.name }}" yum "{{ item.url }}" 2>&1 | grep 'already defined' + shell: ! faf repoadd --nogpgcheck "{{ item.name }}" yum "{{ item.url | join('" "') }}" 2>&1 | grep 'already defined' become: yes become_user: faf ignore_errors: yes