From d1a4b4e8c24e4bc3e88a84d8305abccdd4c9f2f0 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 3 May 2021 11:45:13 -0400 Subject: [PATCH] Set layer build urls for stx 5.0 On the new STX 5.0 branch, the urls for lower layer build artifacts were left pointing to the master build branch. This update fixes those urls. Closes-Bug: 1926984 Signed-off-by: Scott Little Change-Id: I846c7a03001abaecede1f85099254c1486b995be --- .../config/centos/containers/required_layer_pkgs.cfg | 10 +++++----- .../centos/containers/required_layer_wheel_inc.cfg | 8 ++++---- .../yum.repos.d/StarlingX_cengn_compiler_layer.repo | 4 ++-- .../yum.repos.d/StarlingX_cengn_distro_layer.repo | 6 +++--- .../yum.repos.d/StarlingX_cengn_flock_layer.repo | 2 +- .../config/centos/distro/required_layer_iso_inc.cfg | 4 ++-- .../config/centos/distro/required_layer_pkgs.cfg | 2 +- .../yum.repos.d/StarlingX_cengn_compiler_layer.repo | 4 ++-- .../config/centos/flock/required_layer_iso_inc.cfg | 8 ++++---- .../config/centos/flock/required_layer_pkgs.cfg | 8 ++++---- .../config/centos/flock/required_layer_wheel_inc.cfg | 4 ++-- .../yum.repos.d/StarlingX_cengn_compiler_layer.repo | 4 ++-- .../yum.repos.d/StarlingX_cengn_distro_layer.repo | 6 +++--- 13 files changed, 35 insertions(+), 35 deletions(-) diff --git a/centos-mirror-tools/config/centos/containers/required_layer_pkgs.cfg b/centos-mirror-tools/config/centos/containers/required_layer_pkgs.cfg index 7979f444..042cb59f 100644 --- a/centos-mirror-tools/config/centos/containers/required_layer_pkgs.cfg +++ b/centos-mirror-tools/config/centos/containers/required_layer_pkgs.cfg @@ -1,5 +1,5 @@ -compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst -distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/rpm.lst -distro,rt,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst -distro,installer,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/rpm.lst -flock,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/flock/latest_build/outputs/RPMS/std/rpm.lst +compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst +distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/std/rpm.lst +distro,rt,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst +distro,installer,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/installer/rpm.lst +flock,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/flock/latest_build/outputs/RPMS/std/rpm.lst diff --git a/centos-mirror-tools/config/centos/containers/required_layer_wheel_inc.cfg b/centos-mirror-tools/config/centos/containers/required_layer_wheel_inc.cfg index 1d435945..3155d4bc 100644 --- a/centos-mirror-tools/config/centos/containers/required_layer_wheel_inc.cfg +++ b/centos-mirror-tools/config/centos/containers/required_layer_wheel_inc.cfg @@ -1,4 +1,4 @@ -distro,stable,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_stable_wheels.inc -distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_dev_wheels.inc -flock,stable,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/flock/latest_build/outputs/centos_stable_wheels.inc -flock,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/flock/latest_build/outputs/centos_dev_wheels.inc \ No newline at end of file +distro,stable,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/centos_stable_wheels.inc +distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/centos_dev_wheels.inc +flock,stable,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/flock/latest_build/outputs/centos_stable_wheels.inc +flock,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/flock/latest_build/outputs/centos_dev_wheels.inc diff --git a/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_compiler_layer.repo b/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_compiler_layer.repo index 22bd747a..42cfc662 100644 --- a/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_compiler_layer.repo +++ b/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_compiler_layer.repo @@ -3,10 +3,10 @@ [Starlingx-cengn_compiler_std_layer] name=Starlingx-cengn_compiler_std_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/std/ enabled=1 [Starlingx-cengn_compiler_installer_layer] name=Starlingx-cengn_compiler_installer_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/installer/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/installer/ enabled=1 diff --git a/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_distro_layer.repo b/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_distro_layer.repo index 84bcb31e..1416c4f9 100644 --- a/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_distro_layer.repo +++ b/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_distro_layer.repo @@ -3,16 +3,16 @@ [Starlingx-cengn_distro_std_layer] name=Starlingx-cengn_distro_std_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/std/ enabled=1 [Starlingx-cengn_distro_rt_layer] name=Starlingx-cengn_distro_rt_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/rt/ enabled=1 [Starlingx-cengn_distro_installer_layer] name=Starlingx-cengn_distro_installer_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/installer/ enabled=1 diff --git a/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_flock_layer.repo b/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_flock_layer.repo index de7bec46..271b5dda 100644 --- a/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_flock_layer.repo +++ b/centos-mirror-tools/config/centos/containers/yum.repos.d/StarlingX_cengn_flock_layer.repo @@ -3,6 +3,6 @@ [Starlingx-cengn_flock_std_layer] name=Starlingx-cengn_flock_std_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/flock/latest_build/outputs/RPMS/std/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/flock/latest_build/outputs/RPMS/std/ enabled=1 diff --git a/centos-mirror-tools/config/centos/distro/required_layer_iso_inc.cfg b/centos-mirror-tools/config/centos/distro/required_layer_iso_inc.cfg index e80e1aca..05f5f7d6 100644 --- a/centos-mirror-tools/config/centos/distro/required_layer_iso_inc.cfg +++ b/centos-mirror-tools/config/centos/distro/required_layer_iso_inc.cfg @@ -1,2 +1,2 @@ -compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/image.inc -compiler,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/image-dev.inc +compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/image.inc +compiler,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/image-dev.inc diff --git a/centos-mirror-tools/config/centos/distro/required_layer_pkgs.cfg b/centos-mirror-tools/config/centos/distro/required_layer_pkgs.cfg index 8a6b8cfc..242805f2 100644 --- a/centos-mirror-tools/config/centos/distro/required_layer_pkgs.cfg +++ b/centos-mirror-tools/config/centos/distro/required_layer_pkgs.cfg @@ -1 +1 @@ -compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst +compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst diff --git a/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo b/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo index 22bd747a..42cfc662 100644 --- a/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo +++ b/centos-mirror-tools/config/centos/distro/yum.repos.d/StarlingX_cengn_compiler_layer.repo @@ -3,10 +3,10 @@ [Starlingx-cengn_compiler_std_layer] name=Starlingx-cengn_compiler_std_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/std/ enabled=1 [Starlingx-cengn_compiler_installer_layer] name=Starlingx-cengn_compiler_installer_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/installer/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/installer/ enabled=1 diff --git a/centos-mirror-tools/config/centos/flock/required_layer_iso_inc.cfg b/centos-mirror-tools/config/centos/flock/required_layer_iso_inc.cfg index 992c6487..27f139cb 100644 --- a/centos-mirror-tools/config/centos/flock/required_layer_iso_inc.cfg +++ b/centos-mirror-tools/config/centos/flock/required_layer_iso_inc.cfg @@ -1,4 +1,4 @@ -compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/image.inc -compiler,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/image-dev.inc -distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/image.inc -distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/image-dev.inc +compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/image.inc +compiler,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/image-dev.inc +distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/image.inc +distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/image-dev.inc diff --git a/centos-mirror-tools/config/centos/flock/required_layer_pkgs.cfg b/centos-mirror-tools/config/centos/flock/required_layer_pkgs.cfg index a549d540..a92fd0bc 100644 --- a/centos-mirror-tools/config/centos/flock/required_layer_pkgs.cfg +++ b/centos-mirror-tools/config/centos/flock/required_layer_pkgs.cfg @@ -1,4 +1,4 @@ -compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst -distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/rpm.lst -distro,rt,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst -distro,installer,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/rpm.lst +compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst +distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/std/rpm.lst +distro,rt,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst +distro,installer,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/installer/rpm.lst diff --git a/centos-mirror-tools/config/centos/flock/required_layer_wheel_inc.cfg b/centos-mirror-tools/config/centos/flock/required_layer_wheel_inc.cfg index c3b4b4f3..5c8ba43b 100644 --- a/centos-mirror-tools/config/centos/flock/required_layer_wheel_inc.cfg +++ b/centos-mirror-tools/config/centos/flock/required_layer_wheel_inc.cfg @@ -1,2 +1,2 @@ -distro,stable,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_stable_wheels.inc -distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_dev_wheels.inc +distro,stable,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/centos_stable_wheels.inc +distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/centos_dev_wheels.inc diff --git a/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_compiler_layer.repo b/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_compiler_layer.repo index 22bd747a..42cfc662 100644 --- a/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_compiler_layer.repo +++ b/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_compiler_layer.repo @@ -3,10 +3,10 @@ [Starlingx-cengn_compiler_std_layer] name=Starlingx-cengn_compiler_std_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/std/ enabled=1 [Starlingx-cengn_compiler_installer_layer] name=Starlingx-cengn_compiler_installer_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/installer/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/compiler/latest_build/outputs/RPMS/installer/ enabled=1 diff --git a/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_distro_layer.repo b/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_distro_layer.repo index 84bcb31e..1416c4f9 100644 --- a/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_distro_layer.repo +++ b/centos-mirror-tools/config/centos/flock/yum.repos.d/StarlingX_cengn_distro_layer.repo @@ -3,16 +3,16 @@ [Starlingx-cengn_distro_std_layer] name=Starlingx-cengn_distro_std_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/std/ enabled=1 [Starlingx-cengn_distro_rt_layer] name=Starlingx-cengn_distro_rt_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/rt/ enabled=1 [Starlingx-cengn_distro_installer_layer] name=Starlingx-cengn_distro_installer_layer -baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/ +baseurl=http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/5.0/centos/distro/latest_build/outputs/RPMS/installer/ enabled=1