From 2c624b12e1994fdbc4724dc21f978044042183dc Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Mon, 15 Apr 2019 20:39:11 -0500
Subject: [PATCH] obs: distros: Update ubuntu repositories

When CI (re)create repos, this does not provide ubuntu
updates.

- Ubuntu 16.04 requiere enable more repositories to
get latest gcc and allow build with golang.

- Add support to define multiple repositories

Repositories are comma separated in distros file.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 obs-packaging/create-repo-branch.sh | 20 +++++++++++++++-----
 obs-packaging/distros               |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/obs-packaging/create-repo-branch.sh b/obs-packaging/create-repo-branch.sh
index 571c048304..3588df5de3 100755
--- a/obs-packaging/create-repo-branch.sh
+++ b/obs-packaging/create-repo-branch.sh
@@ -69,14 +69,24 @@ read_maintainers(){
 create_repos_xml_nodes() {
 	for entry in "${repos[@]}"; do
 		[ -z "$entry" ] && die "found empty entry"
-		local name=$(echo "$entry" | awk -F"::" '{print $1;}')
-		local project=$(echo "$entry" | awk -F"::" '{print $2;}')
-		local repository=$(echo "$entry" | awk -F"::" '{print $3;}')
+
+		local name
+		local project
+		local repositories
+		name=$(echo "$entry" | awk -F"::" '{print $1;}')
+		project=$(echo "$entry" | awk -F"::" '{print $2;}')
+		repositories=$(echo "$entry" | awk -F"::" '{print $3;}')
+
 		[ -z "$name" ] && die "no name for entry '$entry'"
 		[ -z "$project" ] && die "no project for entry '$entry'"
-		[ -z "$repository" ] && die "no repository for entry '$entry'"
+		[ -z "$repositories" ] && die "no repository for entry '$entry'"
+
 		echo "  <repository name=\"${name}\">"
-		echo "    <path project=\"${project}\" repository=\"${repository}\"/>"
+
+		echo "${repositories}"| tr ',' '\n' | while read -r repository; do
+			echo "    <path project=\"${project}\" repository=\"${repository}\"/>"
+		done
+
 		arch_target_obs=${arch_target}
 		if [ "$arch_target" == "ppc64" ]; then
 			arch_target_obs="ppc64le"
diff --git a/obs-packaging/distros b/obs-packaging/distros
index 10036209eb..47bf038490 100644
--- a/obs-packaging/distros
+++ b/obs-packaging/distros
@@ -13,5 +13,5 @@ SLE_12_SP3::SUSE:SLE-12-SP3:GA::standard
 openSUSE_Leap_42.3::openSUSE:Leap:42.3::standard
 openSUSE_Leap_15.0::openSUSE:Leap:15.0::standard
 openSUSE_Tumbleweed::openSUSE:Factory::snapshot
-xUbuntu_16.04::Ubuntu:16.04::universe
+xUbuntu_16.04::Ubuntu:16.04::universe,universe-update,update
 xUbuntu_18.04::Ubuntu:18.04::universe