From 166ff487b3bc9ddcf32e8b73e2ae275a60e53629 Mon Sep 17 00:00:00 2001
From: Jianhong Yin <jiyin@redhat.com>
Date: Fri, 5 Aug 2022 18:50:42 +0800
Subject: [PATCH] update buildroot url generate code

Signed-off-by: Jianhong Yin <yin-jianhong@163.com>
---
 conf/default-ks.cfg.example    | 36 +++++++++++++++++++-------------
 utils/enable-buildroot-repo.sh | 38 ++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/conf/default-ks.cfg.example b/conf/default-ks.cfg.example
index c76e7e78..2f803802 100644
--- a/conf/default-ks.cfg.example
+++ b/conf/default-ks.cfg.example
@@ -3,22 +3,30 @@
 verx=$(rpm -E %rhel)
 case $verx in
 8|9)
-	[[ "$verx" = 8 ]] && R8=-RHEL-8
-	[[ "$verx" = 9 ]] && stype=-Beta
-	read dtype distro <<< $(awk -F/+ '/^baseurl/ {
-		for (i=3;i<NF;i++) {
-			if ($(i+1) ~ /RHEL-/) {
-				d=$(i+1)
-				if (d ~ /RHEL-[0-9]$/)
-					d=$(i+2)
-				print($i, d)
-				break
-			}
+	baserepofile=$(grep BaseOS$ -r /etc/yum.repos.d/ -l)
+	url=$(awk '/^baseurl/{print $3}' $baserepofile)
+	echo $url >&2
+	{ read; read os arch osv ver _; } < <(tac -s ' ' <<<"${url//\// }")
+	debug_url=${url/\/os/\/debug\/tree}
+	read dtype distro <<< $(awk -F/+ '{
+		for (i=3;i<NF;i++) { if ($(i+1) ~ /RHEL-/) {
+			d=$(i+1)
+			if (d ~ /RHEL-[0-9]$/) d=$(i+2)
+			print($i, d); break }
 		}
-	}' /etc/yum.repos.d/beaker-BaseOS.repo)
-	dtype=nightly
+	}' <<<"$url")
 	read prefix ver time <<< ${distro//-/ }
-	buildrootUrl=http://download.devel.redhat.com/rhel-$verx/$dtype/BUILDROOT-$verx$stype/latest-BUILDROOT-$ver$R8/compose/Buildroot/$(arch)/os
+	[[ "$dtype" =~ rel-eng|nightly ]] || dtype=nightly
+
+	downhostname=download.devel.redhat.com
+	if [[ $verx = 8 ]]; then
+		buildrootUrl=http://$downhostname/rhel-$verx/$dtype/BUILDROOT-$verx/latest-BUILDROOT-$ver-RHEL-$verx/compose/Buildroot/$(arch)/os
+	elif [[ $verx = 9 ]]; then
+		dtype=nightly
+		buildrootUrl=http://$downhostname/rhel-$verx/$dtype/BUILDROOT-$verx/latest-BUILDROOT-$verx-RHEL-$verx/compose/Buildroot/$(arch)/os
+	fi
+
+	echo $buildrootUrl >&2
 	cat <<-EOF >/etc/yum.repos.d/beaker-buildroot.repo
 	[beaker-buildroot]
 	name=beaker-buildroot
diff --git a/utils/enable-buildroot-repo.sh b/utils/enable-buildroot-repo.sh
index f1a91ebb..44ed9c0a 100755
--- a/utils/enable-buildroot-repo.sh
+++ b/utils/enable-buildroot-repo.sh
@@ -3,24 +3,30 @@
 verx=$(rpm -E %rhel)
 case $verx in
 8|9)
-	[[ "$verx" = 8 ]] && R8=-RHEL-8
-	[[ "$verx" = 9 ]] && stype=-Beta
-	read dtype distro <<< $(awk -F/+ '/^baseurl/ {
-		for (i=3;i<NF;i++) {
-			if ($(i+1) ~ /RHEL-/) {
-				d=$(i+1)
-				if (d ~ /RHEL-[0-9]$/) {
-					d=$(i+2)
-				}
-				print($i, d)
-				break
-			}
+	baserepofile=$(grep BaseOS$ -r /etc/yum.repos.d/ -l)
+	url=$(awk '/^baseurl/{print $3}' $baserepofile)
+	echo $url >&2
+	{ read; read os arch osv ver _; } < <(tac -s ' ' <<<"${url//\// }")
+	debug_url=${url/\/os/\/debug\/tree}
+	read dtype distro <<< $(awk -F/+ '{
+		for (i=3;i<NF;i++) { if ($(i+1) ~ /RHEL-/) {
+			d=$(i+1)
+			if (d ~ /RHEL-[0-9]$/) d=$(i+2)
+			print($i, d); break }
 		}
-	}' /etc/yum.repos.d/beaker-BaseOS.repo)
-
-	dtype=nightly
+	}' <<<"$url")
 	read prefix ver time <<< ${distro//-/ }
-	buildrootUrl=http://download.devel.redhat.com/rhel-$verx/$dtype/BUILDROOT-$verx$stype/latest-BUILDROOT-$ver$R8/compose/Buildroot/$(arch)/os
+	[[ "$dtype" =~ rel-eng|nightly ]] || dtype=nightly
+
+	downhostname=download.devel.redhat.com
+	if [[ $verx = 8 ]]; then
+		buildrootUrl=http://$downhostname/rhel-$verx/$dtype/BUILDROOT-$verx/latest-BUILDROOT-$ver-RHEL-$verx/compose/Buildroot/$(arch)/os
+	elif [[ $verx = 9 ]]; then
+		dtype=nightly
+		buildrootUrl=http://$downhostname/rhel-$verx/$dtype/BUILDROOT-$verx/latest-BUILDROOT-$verx-RHEL-$verx/compose/Buildroot/$(arch)/os
+	fi
+
+	echo $buildrootUrl >&2
 	cat <<-EOF >/etc/yum.repos.d/beaker-buildroot.repo
 	[beaker-buildroot]
 	name=beaker-buildroot