From 805d423e55afbc5f3892b485d0cdffe08b874c52 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 12 Jul 2017 04:06:56 +0000 Subject: [PATCH] Revert "enable proper drpms after release" This reverts commit 4624d788c7b12c6cc0c52696ee76cd3703240b9f. --- roles/bodhi2/backend/files/f26-updates-testing.mash | 7 +++++-- roles/bodhi2/backend/files/f26-updates.mash | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/roles/bodhi2/backend/files/f26-updates-testing.mash b/roles/bodhi2/backend/files/f26-updates-testing.mash index 72f44fd846..2fd0f9fc6a 100644 --- a/roles/bodhi2/backend/files/f26-updates-testing.mash +++ b/roles/bodhi2/backend/files/f26-updates-testing.mash @@ -15,5 +15,8 @@ repoviewtitle = "Fedora 26 Updates Testing - %(arch)s" arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 hash_packages = True delta = True -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 +#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 index f51cada128..fa96f4815f 100644 --- a/roles/bodhi2/backend/files/f26-updates.mash +++ b/roles/bodhi2/backend/files/f26-updates.mash @@ -13,5 +13,8 @@ repoviewtitle = "Fedora 26 Updates - %(arch)s" arches = armhfp i386 ppc64 ppc64le x86_64 aarch64 hash_packages = True delta = True -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/releases/26/Everything/%(arch)s/os +#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/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/