From 6a3d8def8a064c1a8d1922aac7d68a3edc19adea Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 4 Aug 2020 16:51:21 -0700 Subject: [PATCH] Modify the URLs for the 4.0 release build The configuration files that are used by the layered build need point to the correct set of repos so the build consumes the right release configuration lst files and repos. Partial-Bug: 1890350 Change-Id: I7f117455a52cd594051b88c0396e3e92d8273686 Signed-off-by: Saul Wold --- .../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..49a9bda0 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/4.0/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst +distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/distro/latest_build/outputs/RPMS/std/rpm.lst +distro,rt,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst +distro,installer,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/distro/latest_build/outputs/RPMS/installer/rpm.lst +flock,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.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..6c55bf7f 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/4.0/centos/distro/latest_build/outputs/centos_stable_wheels.inc +distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/distro/latest_build/outputs/centos_dev_wheels.inc +flock,stable,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/flock/latest_build/outputs/centos_stable_wheels.inc +flock,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.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..3ebea68e 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/4.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/4.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..adea2598 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/4.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/4.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/4.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..6f92663e 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/4.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..089e9547 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/4.0/centos/compiler/latest_build/outputs/image.inc +compiler,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.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..4e6a4c7e 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/4.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..3ebea68e 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/4.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/4.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..e684aa74 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/4.0/centos/compiler/latest_build/outputs/image.inc +compiler,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/compiler/latest_build/outputs/image-dev.inc +distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/distro/latest_build/outputs/image.inc +distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.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..de29b225 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/4.0/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst +distro,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/distro/latest_build/outputs/RPMS/std/rpm.lst +distro,rt,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.0/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst +distro,installer,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.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..7c26a0bd 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/4.0/centos/distro/latest_build/outputs/centos_stable_wheels.inc +distro,dev,http://mirror.starlingx.cengn.ca/mirror/starlingx/rc/4.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..3ebea68e 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/4.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/4.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..adea2598 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/4.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/4.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/4.0/centos/distro/latest_build/outputs/RPMS/installer/ enabled=1