Merge branch 'master' of /git/ansible

roles/bodhi2/backend/files/f26-updates-testing.mash

@@ -0,0 +1,22 @@
+# 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 = aarch64 armhfp i386 ppc64 ppc64le x86_64
+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
+# point to branched till we release then use above
+#delta_dirs = /pub/fedora/linux/development/26/Everything/%(arch)s/os/
+#parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/26/Everything/%(arch)s/os/

roles/bodhi2/backend/files/f26-updates.mash

@@ -0,0 +1,20 @@
+[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 = aarch64 armhfp i386 ppc64 ppc64le x86_64 
+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
+# point to branched till we release then use above
+delta_dirs = /pub/fedora/linux/development/26/Everything/%(arch)s/os/
+parent_repos = http://download.fedoraproject.org/pub/fedora/linux/development/26/Everything/%(arch)s/os/

roles/bodhi2/backend/files/fedora-updates-push

@@ -7,7 +7,7 @@ ATOMICDEST=/mnt/koji/atomic/
 
 OPTIONS="-rlptDvHh --stats --delay-updates $RSYNC_OPTS"
 
-for rel in 24 25; do
+for rel in 24 25 26; do
 
     OUTPUT1=$(rsync $OPTIONS --exclude "repodata/*" \
             $SOURCE/f$rel-updates/ $DEST/$rel/ --link-dest $DEST/testing/$rel/)
@@ -28,7 +28,7 @@ for rel in 24 25; do
     fi
 
 done
-for rel in 24 25; do
+for rel in 24 25 26; do
 
     OUTPUT1=$(rsync $OPTIONS --exclude "repodata/*" \
             $SOURCE/f$rel-updates-testing/ $DEST/testing/$rel/)

roles/bodhi2/backend/tasks/main.yml

@@ -107,6 +107,8 @@
   - f24-updates-testing.mash
   - f25-updates.mash
   - f25-updates-testing.mash
+  - f26-updates.mash
+  - f26-updates-testing.mash
   - dist-5E-epel.mash
   - dist-5E-epel-testing.mash
   - dist-6E-epel.mash