From 628622593fd397288fc938822874e4172e0d9f22 Mon Sep 17 00:00:00 2001
From: Martin Krizek <mkrizek@redhat.com>
Date: Thu, 13 Jul 2017 09:01:13 +0000
Subject: [PATCH] taskotron: update yumrepoinfo for f26 release

---
 .../taskotron-client/files/yumrepoinfo.conf   |   6 +-
 .../files/yumrepoinfo.conf.dev                | 100 ------------------
 .../taskotron/taskotron-client/tasks/main.yml |   4 -
 3 files changed, 3 insertions(+), 107 deletions(-)
 delete mode 100644 roles/taskotron/taskotron-client/files/yumrepoinfo.conf.dev

diff --git a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf b/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
index aa4795ba29..ab01e52989 100644
--- a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
+++ b/roles/taskotron/taskotron-client/files/yumrepoinfo.conf
@@ -41,9 +41,9 @@ release_status = rawhide
 
 # Fedora 26
 [f26]
-url = %(rawhideurl)s
-path = development/26
-release_status = branched
+url = %(goldurl)s
+path = 26
+release_status = stable
 
 [f26-updates]
 url = %(updatesurl)s
diff --git a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf.dev b/roles/taskotron/taskotron-client/files/yumrepoinfo.conf.dev
deleted file mode 100644
index ab01e52989..0000000000
--- a/roles/taskotron/taskotron-client/files/yumrepoinfo.conf.dev
+++ /dev/null
@@ -1,100 +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://download.fedoraproject.org/pub/fedora/linux
-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 primary and alternate architectures. That decides whether baseurl or baseurl_altarch
-# is used when determining path.
-primary_arches = armhfp, x86_64
-alternate_arches = aarch64, i386, ppc64, ppc64le, s390x
-
-# 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 = %(goldurl)s
-path = 26
-release_status = stable
-
-[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
-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
diff --git a/roles/taskotron/taskotron-client/tasks/main.yml b/roles/taskotron/taskotron-client/tasks/main.yml
index 2e2d4c4116..f371dbf223 100644
--- a/roles/taskotron/taskotron-client/tasks/main.yml
+++ b/roles/taskotron/taskotron-client/tasks/main.yml
@@ -46,10 +46,6 @@
   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 to dev (temp workaround for kparal)
-  when: deployment_type in ['dev']
-  copy: src=yumrepoinfo.conf.dev dest=/etc/taskotron/yumrepoinfo.conf owner=root group=root mode=0644
-
 - name: check that baseurl= line exists in yumrepoinfo.conf
   command: grep -q '^baseurl =' /etc/taskotron/yumrepoinfo.conf
   changed_when: False