From fa0cfc333bc93693178dcbb821140fd6a0a4d66f Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Tue, 20 Feb 2018 21:38:56 +0000 Subject: [PATCH] Remove all of Bodhi's mash configs since we use Pungi now. Signed-off-by: Randy Barlow --- .../backend/files/dist-6E-epel-testing.mash | 18 --------------- roles/bodhi2/backend/files/dist-6E-epel.mash | 18 --------------- roles/bodhi2/backend/files/epel7-testing.mash | 18 --------------- roles/bodhi2/backend/files/epel7.mash | 18 --------------- .../backend/files/f26-updates-testing.mash | 22 ------------------- roles/bodhi2/backend/files/f26-updates.mash | 20 ----------------- .../backend/files/f27-updates-testing.mash | 22 ------------------- roles/bodhi2/backend/files/f27-updates.mash | 20 ----------------- .../backend/files/f28-updates-testing.mash | 22 ------------------- roles/bodhi2/backend/files/f28-updates.mash | 20 ----------------- roles/bodhi2/backend/tasks/main.yml | 22 ------------------- 11 files changed, 220 deletions(-) delete mode 100644 roles/bodhi2/backend/files/dist-6E-epel-testing.mash delete mode 100644 roles/bodhi2/backend/files/dist-6E-epel.mash delete mode 100644 roles/bodhi2/backend/files/epel7-testing.mash delete mode 100644 roles/bodhi2/backend/files/epel7.mash delete mode 100644 roles/bodhi2/backend/files/f26-updates-testing.mash delete mode 100644 roles/bodhi2/backend/files/f26-updates.mash delete mode 100644 roles/bodhi2/backend/files/f27-updates-testing.mash delete mode 100644 roles/bodhi2/backend/files/f27-updates.mash delete mode 100644 roles/bodhi2/backend/files/f28-updates-testing.mash delete mode 100644 roles/bodhi2/backend/files/f28-updates.mash diff --git a/roles/bodhi2/backend/files/dist-6E-epel-testing.mash b/roles/bodhi2/backend/files/dist-6E-epel-testing.mash deleted file mode 100644 index de612d6023..0000000000 --- a/roles/bodhi2/backend/files/dist-6E-epel-testing.mash +++ /dev/null @@ -1,18 +0,0 @@ -# mash config file - -[dist-6E-epel-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo_path = %(arch)s/debug -debuginfo = True -multilib = True -multilib_method = devel -tag = dist-6E-epel-testing -inherit = False -strict_keys = True -keys = 0608b895 -use_repoview = False -repoviewurl = http://download.fedoraproject.org/pub/epel/testing/6/%(arch)s/ -repoviewtitle = "Fedora EPEL Testing 6 - %(arch)s" -arches = i386 x86_64 ppc64 -compress_type = bz2 diff --git a/roles/bodhi2/backend/files/dist-6E-epel.mash b/roles/bodhi2/backend/files/dist-6E-epel.mash deleted file mode 100644 index 8e55f4778d..0000000000 --- a/roles/bodhi2/backend/files/dist-6E-epel.mash +++ /dev/null @@ -1,18 +0,0 @@ -# mash config file - -[dist-6E-epel] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo_path = %(arch)s/debug -debuginfo = True -multilib = True -multilib_method = devel -tag = dist-6E-epel -inherit = False -strict_keys = True -keys = 0608b895 -use_repoview = False -repoviewurl = http://download.fedoraproject.org/pub/epel/6/%(arch)s/ -repoviewtitle = "Fedora EPEL 6 - %(arch)s" -arches = i386 x86_64 ppc64 -compress_type = bz2 diff --git a/roles/bodhi2/backend/files/epel7-testing.mash b/roles/bodhi2/backend/files/epel7-testing.mash deleted file mode 100644 index dd29d3ea7a..0000000000 --- a/roles/bodhi2/backend/files/epel7-testing.mash +++ /dev/null @@ -1,18 +0,0 @@ -# mash config file - -[epel7-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo_path = %(arch)s/debug -debuginfo = True -multilib = False -tag = epel7-testing -inherit = False -strict_keys = True -keys = 352C64E5 -use_repoview = False -repoviewurl = http://download.fedoraproject.org/pub/epel/testing/7/%(arch)s/ -repoviewtitle = "Fedora EPEL Testing 7 - %(arch)s" -arches = x86_64 ppc64 ppc64le aarch64 -hash_packages = True -delta = False diff --git a/roles/bodhi2/backend/files/epel7.mash b/roles/bodhi2/backend/files/epel7.mash deleted file mode 100644 index 391ae45965..0000000000 --- a/roles/bodhi2/backend/files/epel7.mash +++ /dev/null @@ -1,18 +0,0 @@ -# mash config file - -[epel7] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo_path = %(arch)s/debug -debuginfo = True -multilib = False -tag = epel7 -inherit = False -strict_keys = True -keys = 352C64E5 -use_repoview = False -repoviewurl = http://download.fedoraproject.org/pub/epel/7/%(arch)s/ -repoviewtitle = "Fedora EPEL 7 - %(arch)s" -arches = x86_64 ppc64 ppc64le aarch64 -hash_packages = True -delta = False diff --git a/roles/bodhi2/backend/files/f26-updates-testing.mash b/roles/bodhi2/backend/files/f26-updates-testing.mash deleted file mode 100644 index 0aa17020dc..0000000000 --- a/roles/bodhi2/backend/files/f26-updates-testing.mash +++ /dev/null @@ -1,22 +0,0 @@ -# mash config file - -[f26-updates-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f26-updates-testing -inherit = False -strict_keys = True -keys = 64dab85d -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/26/%(arch)s/ -repoviewtitle = "Fedora 26 Updates Testing - %(arch)s" -arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 -hash_packages = True -delta = False -#delta_dirs = /pub/fedora/linux/releases/26/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f26-updates/%(arch)s/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/26/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/26/Everything/%(arch)s/os -# point to branched till we release then use above -#delta_dirs = /mnt/koji/compose/branched/latest-Fedora-26/compose/Everything/%(arch)s/os/ -#parent_repos = https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-26/compose/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f26-updates.mash b/roles/bodhi2/backend/files/f26-updates.mash deleted file mode 100644 index 76a01e082e..0000000000 --- a/roles/bodhi2/backend/files/f26-updates.mash +++ /dev/null @@ -1,20 +0,0 @@ -[f26-updates] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f26-updates -inherit = False -strict_keys = True -keys = 64dab85d -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/26/%(arch)s/ -repoviewtitle = "Fedora 26 Updates - %(arch)s" -arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 -hash_packages = True -delta = True -delta_dirs = /mnt/koji/compose/26/Fedora-26-20170705.0/compose/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f26-updates/%(arch)s/ -parent_repos = https://kojipkgs.fedoraproject.org/compose/26/Fedora-26-20170705.0/compose/Everything//%(arch)s/os -# point to branched till we release then use above -#delta_dirs = /mnt/koji/compose/branched/latest-Fedora-26/compose/Everything/%(arch)s/os/ -#parent_repos = https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-26/compose/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f27-updates-testing.mash b/roles/bodhi2/backend/files/f27-updates-testing.mash deleted file mode 100644 index 4bb67e3f52..0000000000 --- a/roles/bodhi2/backend/files/f27-updates-testing.mash +++ /dev/null @@ -1,22 +0,0 @@ -# mash config file - -[f27-updates-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f27-updates-testing -inherit = False -strict_keys = True -keys = f5282ee4 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/27/%(arch)s/ -repoviewtitle = "Fedora 27 Updates Testing - %(arch)s" -arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 s390x -hash_packages = True -delta = True -#delta_dirs = /pub/fedora/linux/releases/27/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f27-updates/%(arch)s/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/27/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/27/Everything/%(arch)s/os -# point to branched till we release then use above -delta_dirs = /mnt/koji/compose/branched/latest-Fedora-27/compose/Everything/%(arch)s/os/ -parent_repos = https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-27/compose/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f27-updates.mash b/roles/bodhi2/backend/files/f27-updates.mash deleted file mode 100644 index 3106822d97..0000000000 --- a/roles/bodhi2/backend/files/f27-updates.mash +++ /dev/null @@ -1,20 +0,0 @@ -[f27-updates] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f27-updates -inherit = False -strict_keys = True -keys = f5282ee4 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/27/%(arch)s/ -repoviewtitle = "Fedora 27 Updates - %(arch)s" -arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 s390x -hash_packages = True -delta = True -#delta_dirs = /pub/fedora/linux/releases/27/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f27-updates/%(arch)s/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/27/Everything/%(arch)s/os -# point to branched till we release then use above -delta_dirs = /mnt/koji/compose/branched/latest-Fedora-27/compose/Everything/%(arch)s/os/ -parent_repos = https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-27/compose/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f28-updates-testing.mash b/roles/bodhi2/backend/files/f28-updates-testing.mash deleted file mode 100644 index 4030f08513..0000000000 --- a/roles/bodhi2/backend/files/f28-updates-testing.mash +++ /dev/null @@ -1,22 +0,0 @@ -# mash config file - -[f28-updates-testing] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f28-updates-testing -inherit = False -strict_keys = True -keys = 429476b4 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/testing/28/%(arch)s/ -repoviewtitle = "Fedora 28 Updates Testing - %(arch)s" -arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 s390x -hash_packages = True -delta = True -#delta_dirs = /pub/fedora/linux/releases/28/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f28-updates/%(arch)s/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/28/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/28/Everything/%(arch)s/os -# point to branched till we release then use above -delta_dirs = /mnt/koji/compose/branched/latest-Fedora-28/compose/Everything/%(arch)s/os/ -parent_repos = https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/files/f28-updates.mash b/roles/bodhi2/backend/files/f28-updates.mash deleted file mode 100644 index b92a9d78ae..0000000000 --- a/roles/bodhi2/backend/files/f28-updates.mash +++ /dev/null @@ -1,20 +0,0 @@ -[f28-updates] -rpm_path = %(arch)s/ -source_path = SRPMS/ -debuginfo = True -multilib = True -multilib_method = devel -tag = f28-updates -inherit = False -strict_keys = True -keys = 429476b4 -repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/updates/28/%(arch)s/ -repoviewtitle = "Fedora 28 Updates - %(arch)s" -arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 s390x -hash_packages = True -delta = True -#delta_dirs = /pub/fedora/linux/releases/28/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f28-updates/%(arch)s/ -#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/28/Everything/%(arch)s/os -# point to branched till we release then use above -delta_dirs = /mnt/koji/compose/branched/latest-Fedora-28/compose/Everything/%(arch)s/os/ -parent_repos = https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-28/compose/Everything/%(arch)s/os/ diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml index 30f21b7334..b9cd9673de 100644 --- a/roles/bodhi2/backend/tasks/main.yml +++ b/roles/bodhi2/backend/tasks/main.yml @@ -118,28 +118,6 @@ - bodhi when: env == "production" -- name: install /etc/bodhi/*.mash files - copy: > - src="{{ item }}" - dest="/etc/bodhi/{{ item }}" - owner=apache - mode=0640 - with_items: - - f26-updates.mash - - f26-updates-testing.mash - - f27-updates.mash - - f27-updates-testing.mash - - f28-updates.mash - - f28-updates-testing.mash - - dist-6E-epel.mash - - dist-6E-epel-testing.mash - - epel7.mash - - epel7-testing.mash - tags: - - config - - bodhi - when: env == "production" - # tasks for setting up epelmasher - name: install needed packages