taskotron-client: update yumrepoinfo.conf

roles/taskotron/taskotron-client/files/yumrepoinfo-dev.conf

@@ -1,96 +0,0 @@
-## A Taskotron configuration file representing available YUM repositories inside
-## Fedora infrastructure.
-## This file is in a ConfigParser syntax, very similar to INI syntax known from
-## Windows.
-## There is a guide describing how to update this file after important Fedora
-## release events, please see:
-## https://fedoraproject.org/wiki/How_to_update_yumrepoinfo.conf_in_Taskotron
-
-[DEFAULT]
-# URLs to yum repos
-# Please note: 'download.fedoraproject.org' is a redirect that points you to a
-# random mirror every time. For faster and more reliable operation, pick a close
-# mirror from https://mirrors.fedoraproject.org and use it in 'baseurl' and 'baseurl_altarch'.
-baseurl = http://infrastructure.fedoraproject.org/pub/fedora/linux
-baseurl_altarch = http://infrastructure.fedoraproject.org/pub/fedora-secondary
-goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os
-updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
-rawhideurl = %(baseurl)s/%(path)s/Everything/%(arch)s/os
-
-# list of supported architectures
-primary_arches = i386, x86_64
-
-# we need to know which of them are alternate architectures. For those, baseurl_altarch is used
-# instead of baseurl.
-alternate_arches = aarch64, i386, ppc64, ppc64le, s290x
-
-# a direct parent of this repo, essential for operations (dependencies)
-parent =
-
-# koji tag defaults to section name
-tag = %(__name__)s
-
-# release_status can be one of: obsolete, stable, branched or rawhide
-# for non-top-parent repos this is an empty string
-release_status =
-
-# Rawhide
-[rawhide]
-url = %(rawhideurl)s
-path = development/rawhide
-tag = f27
-release_status = rawhide
-
-# Fedora 26
-[f26]
-url = %(rawhideurl)s
-path = development/26
-release_status = branched
-
-[f26-updates]
-url = %(updatesurl)s
-path = 26
-parent = f26
-
-[f26-updates-testing]
-url = %(updatesurl)s
-path = testing/26
-parent = f26-updates
-
-# Fedora 25
-[f25]
-url = %(goldurl)s
-path = 25
-release_status = stable
-alternate_arches =
-
-[f25-updates]
-url = %(updatesurl)s
-path = 25
-parent = f25
-alternate_arches =
-
-[f25-updates-testing]
-url = %(updatesurl)s
-path = testing/25
-parent = f25-updates
-alternate_arches =
-
-# Fedora 24
-[f24]
-url = %(goldurl)s
-path = 24
-release_status = stable
-alternate_arches =
-
-[f24-updates]
-url = %(updatesurl)s
-path = 24
-parent = f24
-alternate_arches =
-
-[f24-updates-testing]
-url = %(updatesurl)s
-path = testing/24
-parent = f24-updates
-alternate_arches =

roles/taskotron/taskotron-client/files/yumrepoinfo.conf

@@ -10,19 +10,17 @@
 # URLs to yum repos
 # Please note: 'download.fedoraproject.org' is a redirect that points you to a
 # random mirror every time. For faster and more reliable operation, pick a close
-# mirror from http://mirrors.fedoraproject.org and use it in 'baseurl'.
+# mirror from https://mirrors.fedoraproject.org and use it in 'baseurl' and 'baseurl_altarch'.
-baseurl = http://infrastructure.fedoraproject.org/pub/fedora/linux
+baseurl = http://download.fedoraproject.org/pub/fedora/linux
-baseurl_altarch = http://infrastructure.fedoraproject.org/pub/fedora-secondary
+baseurl_altarch = http://download.fedoraproject.org/pub/fedora-secondary
 goldurl = %(baseurl)s/releases/%(path)s/Everything/%(arch)s/os
 updatesurl = %(baseurl)s/updates/%(path)s/%(arch)s
 rawhideurl = %(baseurl)s/%(path)s/Everything/%(arch)s/os
 
-# list of supported architectures
+# list of primary and alternate architectures. That decides whether baseurl or baseurl_altarch
-primary_arches = i386, x86_64
+# is used when determining path.
-
+primary_arches = armhfp, x86_64
-# we need to know which of them are alternate architectures. For those, baseurl_altarch is used
+alternate_arches = aarch64, i386, ppc64, ppc64le, s390x
-# instead of baseurl.
-alternate_arches = aarch64, i386, ppc64, ppc64le, s290x
 
 # a direct parent of this repo, essential for operations (dependencies)
 parent =
@@ -62,29 +60,41 @@ parent = f26-updates
 url = %(goldurl)s
 path = 25
 release_status = stable
+primary_arches = armhfp, i386, x86_64
+alternate_arches = aarch64, ppc64, ppc64le, s390x
 
 [f25-updates]
 url = %(updatesurl)s
 path = 25
 parent = f25
+primary_arches = armhfp, i386, x86_64
+alternate_arches = aarch64, ppc64, ppc64le, s390x
 
 [f25-updates-testing]
 url = %(updatesurl)s
 path = testing/25
 parent = f25-updates
+primary_arches = armhfp, i386, x86_64
+alternate_arches = aarch64, ppc64, ppc64le, s390x
 
 # Fedora 24
 [f24]
 url = %(goldurl)s
 path = 24
 release_status = stable
+primary_arches = armhfp, i386, x86_64
+alternate_arches = aarch64, ppc64, ppc64le, s390x
 
 [f24-updates]
 url = %(updatesurl)s
 path = 24
 parent = f24
+primary_arches = armhfp, i386, x86_64
+alternate_arches = aarch64, ppc64, ppc64le, s390x
 
 [f24-updates-testing]
 url = %(updatesurl)s
 path = testing/24
 parent = f24-updates
+primary_arches = armhfp, i386, x86_64
+alternate_arches = aarch64, ppc64, ppc64le, s390x

roles/taskotron/taskotron-client/tasks/main.yml

@@ -42,17 +42,12 @@
   when: deployment_type in ['dev', 'stg', 'prod']
   template: src=settings.py.testcloud.j2 dest=/etc/testcloud/settings.py owner=root group=root mode=0644
 
-# hotfixing correct yumrepoinfo until libtaskotron is updated
 - name: upload yumrepoinfo.conf
-  when: deployment_type in ['stg', 'prod']
+  when: deployment_type in ['dev', 'stg', 'prod']
   copy: src=yumrepoinfo.conf dest=/etc/taskotron/yumrepoinfo.conf owner=root group=root mode=0644
 
-- name: upload yumrepoinfo.conf
-  when: deployment_type in ['dev']
-  copy: src=yumrepoinfo-dev.conf dest=/etc/taskotron/yumrepoinfo.conf owner=root group=root mode=0644
-
 - name: set baseurl of yumrepoinfo.conf
-  replace: dest=/etc/taskotron/yumrepoinfo.conf regexp='baseurl = http://download\.fedoraproject\.org/.*' replace='baseurl = http://infrastructure.fedoraproject.org/pub/fedora/linux'
+  replace: dest=/etc/taskotron/yumrepoinfo.conf regexp='//download\.fedoraproject\.org/' replace='//infrastructure.fedoraproject.org/'
 
 - name: create /var/log/taskotron for task logfiles
   file: path=/var/log/taskotron state=directory owner={{ slave_user }} group={{ slave_user }} mode=1755