summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Fenzi <kevin@scrye.com>2016-02-25 22:00:29 +0000
committerKevin Fenzi <kevin@scrye.com>2016-02-25 22:00:29 +0000
commitc2c8ee0085702486ca815829341e53deb5dee720 (patch)
treedba3d565b029ff08f4f050f10c5cdfbb3437025a
parent1b933a1f1588c975e18c88c11c4d5dbcccb11388 (diff)
Fix bodhi to not point to development/23 anymore, it should use the released repos
-rw-r--r--roles/bodhi2/backend/files/f23-updates-testing.mash7
-rw-r--r--roles/bodhi2/backend/files/f23-updates.mash7
2 files changed, 4 insertions, 10 deletions
diff --git a/roles/bodhi2/backend/files/f23-updates-testing.mash b/roles/bodhi2/backend/files/f23-updates-testing.mash
index 1c1ca0dec..5e4d23f83 100644
--- a/roles/bodhi2/backend/files/f23-updates-testing.mash
+++ b/roles/bodhi2/backend/files/f23-updates-testing.mash
@@ -15,8 +15,5 @@ repoviewtitle = "Fedora 23 Updates Testing - %(arch)s"
arches = armhfp i386 x86_64
hash_packages = True
delta = True
-#delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/
-#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os
-# point to branched till we release then use above
-delta_dirs = /pub/fedora/linux/development/23/%(arch)s/os/
-parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/23/%(arch)s/os/
+delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/
+parent_repos = http://download.fedoraproject.org/pub/fedora/linux/updates/23/%(arch)s, http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os
diff --git a/roles/bodhi2/backend/files/f23-updates.mash b/roles/bodhi2/backend/files/f23-updates.mash
index 05b803139..b2061e07a 100644
--- a/roles/bodhi2/backend/files/f23-updates.mash
+++ b/roles/bodhi2/backend/files/f23-updates.mash
@@ -13,8 +13,5 @@ repoviewtitle = "Fedora 23 Updates - %(arch)s"
arches = armhfp i386 x86_64
hash_packages = True
delta = True
-#generate deltas against branched
-delta_dirs = /pub/fedora/linux/development/23/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/
-parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/23/%(arch)s/os
-#delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/
-#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os
+delta_dirs = /pub/fedora/linux/releases/23/Everything/%(arch)s/os/,/mnt/koji/mash/updates/f23-updates/%(arch)s/
+parent_repos = http://download.fedoraproject.org/pub/fedora/linux/releases/23/Everything/%(arch)s/os