cengn reference removal - centos
mirror.starlingx.cengn.ca no longer exists. CENGN is kindly forwarding requests to the new location mirror.starlingx.windriver.com for now, but that will only last a few months. We need to replace all the references with the new URL. I will also remove as many 'cengn' references as possible, replacing them with 'stx_mirror' Partial-Bug: 2033555 Signed-off-by: Scott Little <scott.little@windriver.com> Change-Id: I09e3f564edef2049786c965a86dbcaacac359801
This commit is contained in:
Scott Little
parent
3752f6adf1
commit
6f3d1e5dd2
|
|
@ -131,8 +131,8 @@ RUN groupadd -g 751 cgts && \
|
|||
echo "mock:x:751:root" >> /etc/group && \
|
||||
echo "mockbuild:x:9001:" >> /etc/group && \
|
||||
yum install -y \
|
||||
http://mirror.starlingx.cengn.ca/mirror/centos/epel/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/mock-1.4.16-1.el7.noarch.rpm \
|
||||
http://mirror.starlingx.cengn.ca/mirror/centos/epel/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/mock-core-configs-31.6-1.el7.noarch.rpm
|
||||
https://mirror.starlingx.windriver.com/mirror/centos/epel/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/mock-1.4.16-1.el7.noarch.rpm \
|
||||
https://mirror.starlingx.windriver.com/mirror/centos/epel/dl.fedoraproject.org/pub/epel/7/x86_64/Packages/m/mock-core-configs-31.6-1.el7.noarch.rpm
|
||||
|
||||
# mock custumizations
|
||||
# forcing chroots since a couple of packages naughtily insist on network access and
|
||||
|
|
|
|||
|
|
@ -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,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst
|
||||
distro,std,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/rpm.lst
|
||||
distro,rt,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst
|
||||
distro,installer,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/rpm.lst
|
||||
flock,std,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/flock/latest_build/outputs/RPMS/std/rpm.lst
|
||||
|
|
|
|||
|
|
@ -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
|
||||
distro,stable,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_stable_wheels.inc
|
||||
distro,dev,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_dev_wheels.inc
|
||||
flock,stable,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/flock/latest_build/outputs/centos_stable_wheels.inc
|
||||
flock,dev,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/flock/latest_build/outputs/centos_dev_wheels.inc
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
#####
|
||||
# StarlingX compiler layer at CENGN
|
||||
|
||||
[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/
|
||||
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/
|
||||
enabled=1
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#####
|
||||
# StarlingX distro layer at CENGN
|
||||
|
||||
[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/
|
||||
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/
|
||||
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/
|
||||
enabled=1
|
||||
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
#####
|
||||
# StarlingX flock layer at CENGN
|
||||
|
||||
[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/
|
||||
enabled=1
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
#####
|
||||
# StarlingX compiler layer at the StarlingX Mirror
|
||||
|
||||
[Starlingx-mirror_compiler_std_layer]
|
||||
name=Starlingx-mirror_compiler_std_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/
|
||||
enabled=1
|
||||
|
||||
[Starlingx-mirror_compiler_installer_layer]
|
||||
name=Starlingx-mirror_compiler_installer_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/installer/
|
||||
enabled=1
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
#####
|
||||
# StarlingX distro layer at the StarlingX Mirror
|
||||
|
||||
[Starlingx-mirror_distro_std_layer]
|
||||
name=Starlingx-mirror_distro_std_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/
|
||||
enabled=1
|
||||
|
||||
[Starlingx-mirror_distro_rt_layer]
|
||||
name=Starlingx-mirror_distro_rt_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/
|
||||
enabled=1
|
||||
|
||||
[Starlingx-mirror_distro_installer_layer]
|
||||
name=Starlingx-mirror_distro_installer_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/
|
||||
enabled=1
|
||||
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#####
|
||||
# StarlingX flock layer at the StarlingX Mirror
|
||||
|
||||
[Starlingx-mirror_flock_std_layer]
|
||||
name=Starlingx-mirror_flock_std_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/flock/latest_build/outputs/RPMS/std/
|
||||
enabled=1
|
||||
|
||||
|
|
@ -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,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/image.inc
|
||||
compiler,dev,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/image-dev.inc
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
compiler,std,http://mirror.starlingx.cengn.ca/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst
|
||||
compiler,std,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
#####
|
||||
# StarlingX compiler layer at CENGN
|
||||
|
||||
[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/
|
||||
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/
|
||||
enabled=1
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
#####
|
||||
# StarlingX compiler layer at the StarlingX Mirror
|
||||
|
||||
[Starlingx-mirror_compiler_std_layer]
|
||||
name=Starlingx-mirror_compiler_std_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/
|
||||
enabled=1
|
||||
|
||||
[Starlingx-mirror_compiler_installer_layer]
|
||||
name=Starlingx-mirror_compiler_installer_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/installer/
|
||||
enabled=1
|
||||
|
|
@ -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,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/image.inc
|
||||
compiler,dev,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/image-dev.inc
|
||||
distro,std,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/image.inc
|
||||
distro,dev,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/image-dev.inc
|
||||
|
|
|
|||
|
|
@ -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,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/rpm.lst
|
||||
distro,std,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/rpm.lst
|
||||
distro,rt,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/rpm.lst
|
||||
distro,installer,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/rpm.lst
|
||||
|
|
|
|||
|
|
@ -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,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_stable_wheels.inc
|
||||
distro,dev,https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/centos_dev_wheels.inc
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@ influxdb-0.9.5.1-1.x86_64.rpm#https://s3.amazonaws.com/influxdb/influxdb-0.9.5.1
|
|||
libpng-1.5.13-8.el7.x86_64.rpm#http://mirror.centos.org/centos/7/os/x86_64/Packages/libpng-1.5.13-8.el7.x86_64.rpm
|
||||
novnc-0.6.2-1.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/novnc/0.6.2/1.el7/noarch/novnc-0.6.2-1.el7.noarch.rpm
|
||||
libvirt-python-4.7.0-1.fc28.src.rpm#https://libvirt.org/sources/python/libvirt-python-4.7.0-1.fc28.src.rpm
|
||||
opae-devel-1.3.7-5.el7.x86_64.rpm#http://mirror.starlingx.cengn.ca/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-devel-1.3.7-5.el7.x86_64.rpm
|
||||
opae-libs-1.3.7-5.el7.x86_64.rpm#http://mirror.starlingx.cengn.ca/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-libs-1.3.7-5.el7.x86_64.rpm
|
||||
opae-tools-1.3.7-5.el7.x86_64.rpm#http://mirror.starlingx.cengn.ca/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-tools-1.3.7-5.el7.x86_64.rpm
|
||||
opae-tools-extra-1.3.7-5.el7.x86_64.rpm#http://mirror.starlingx.cengn.ca/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-tools-extra-1.3.7-5.el7.x86_64.rpm
|
||||
opae.admin-1.0.3-2.el7.noarch.rpm#http://mirror.starlingx.cengn.ca/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae.admin-1.0.3-2.el7.noarch.rpm
|
||||
opae-devel-1.3.7-5.el7.x86_64.rpm#https://mirror.starlingx.windriver.com/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-devel-1.3.7-5.el7.x86_64.rpm
|
||||
opae-libs-1.3.7-5.el7.x86_64.rpm#https://mirror.starlingx.windriver.com/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-libs-1.3.7-5.el7.x86_64.rpm
|
||||
opae-tools-1.3.7-5.el7.x86_64.rpm#https://mirror.starlingx.windriver.com/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-tools-1.3.7-5.el7.x86_64.rpm
|
||||
opae-tools-extra-1.3.7-5.el7.x86_64.rpm#https://mirror.starlingx.windriver.com/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae-tools-extra-1.3.7-5.el7.x86_64.rpm
|
||||
opae.admin-1.0.3-2.el7.noarch.rpm#https://mirror.starlingx.windriver.com/mirror/centos/github.com/OPAE/opae-sdk/releases/download/1.3.7-5/opae.admin-1.0.3-2.el7.noarch.rpm
|
||||
python2-httpbin-0.5.0-6.el7.noarch.rpm#http://cbs.centos.org/kojifiles/packages/python-httpbin/0.5.0/6.el7/noarch/python2-httpbin-0.5.0-6.el7.noarch.rpm
|
||||
python2-kubernetes-8.0.0-8.el7.noarch.rpm#https://cbs.centos.org/kojifiles/packages/python-kubernetes/8.0.0/8.el7/noarch/python2-kubernetes-8.0.0-8.el7.noarch.rpm
|
||||
python2-pip-9.0.3-6.fc29.noarch.rpm#https://kojipkgs.fedoraproject.org/packages/python-pip/9.0.3/6.fc29/noarch/python2-pip-9.0.3-6.fc29.noarch.rpm
|
||||
|
|
|
|||
|
|
@ -1,12 +0,0 @@
|
|||
#####
|
||||
# StarlingX compiler layer at CENGN
|
||||
|
||||
[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/
|
||||
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/
|
||||
enabled=1
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
#####
|
||||
# StarlingX distro layer at CENGN
|
||||
|
||||
[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/
|
||||
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/
|
||||
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/
|
||||
enabled=1
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
#####
|
||||
# StarlingX compiler layer at the StarlingX Mirror
|
||||
|
||||
[Starlingx-mirror_compiler_std_layer]
|
||||
name=Starlingx-mirror_compiler_std_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/std/
|
||||
enabled=1
|
||||
|
||||
[Starlingx-mirror_compiler_installer_layer]
|
||||
name=Starlingx-mirror_compiler_installer_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/compiler/latest_build/outputs/RPMS/installer/
|
||||
enabled=1
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
#####
|
||||
# StarlingX distro layer at the StarlingX Mirror
|
||||
|
||||
[Starlingx-mirror_distro_std_layer]
|
||||
name=Starlingx-mirror_distro_std_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/std/
|
||||
enabled=1
|
||||
|
||||
[Starlingx-mirror_distro_rt_layer]
|
||||
name=Starlingx-mirror_distro_rt_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/rt/
|
||||
enabled=1
|
||||
|
||||
[Starlingx-mirror_distro_installer_layer]
|
||||
name=Starlingx-mirror_distro_installer_layer
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/starlingx/master/centos/distro/latest_build/outputs/RPMS/installer/
|
||||
enabled=1
|
||||
|
||||
|
|
@ -572,11 +572,17 @@ fi
|
|||
|
||||
if [ ${use_system_yum_conf} -eq 1 ]; then
|
||||
# deleting the StarlingX_3rd to avoid pull centos packages from the 3rd Repo.
|
||||
|
||||
# cengn references for backward compatibility if transitioning
|
||||
# a pre-existing build environment.
|
||||
|
||||
${SUDO} \rm -f $REPO_DIR/StarlingX_3rd*.repo
|
||||
${SUDO} \rm -f $REPO_DIR/StarlingX_cengn*.repo
|
||||
${SUDO} \rm -f $REPO_DIR/StarlingX_mirror*.repo
|
||||
if [ "$TEMP_DIR" != "" ]; then
|
||||
${SUDO} \rm -f $TEMP_DIR/yum.repos.d/StarlingX_3rd*.repo
|
||||
${SUDO} \rm -f $TEMP_DIR/yum.repos.d/StarlingX_cengn*.repo
|
||||
${SUDO} \rm -f $TEMP_DIR/yum.repos.d/StarlingX_mirror*.repo
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -155,10 +155,10 @@ get_arch () {
|
|||
#
|
||||
# Global variables we will use later.
|
||||
#
|
||||
CENGN_REPOS_DIR="$TEMP_DIR/yum.repos.d"
|
||||
CENGN_YUM_CONF="$TEMP_DIR/yum.conf"
|
||||
CENGN_YUM_LOG="$TEMP_DIR/yum.log"
|
||||
CENGN_YUM_CACHDIR="$TEMP_DIR/cache/yum/\$basearch/\$releasever"
|
||||
STX_MIRROR_REPOS_DIR="$TEMP_DIR/yum.repos.d"
|
||||
STX_MIRROR_YUM_CONF="$TEMP_DIR/yum.conf"
|
||||
STX_MIRROR_YUM_LOG="$TEMP_DIR/yum.log"
|
||||
STX_MIRROR_YUM_CACHDIR="$TEMP_DIR/cache/yum/\$basearch/\$releasever"
|
||||
|
||||
RELEASEVER=$(get_releasever)
|
||||
ARCH=$(get_arch)
|
||||
|
|
@ -166,64 +166,64 @@ ARCH=$(get_arch)
|
|||
#
|
||||
# Copy as yet unmodified yum.conf and yum.repos.d from source to dest.
|
||||
#
|
||||
mkdir -p "$CENGN_REPOS_DIR"
|
||||
echo "\cp -r '$SRC_REPO_DIR/*' '$CENGN_REPOS_DIR/'"
|
||||
\cp -r "$SRC_REPO_DIR"/* "$CENGN_REPOS_DIR/"
|
||||
echo "\cp '$SRC_YUM_CONF' '$CENGN_YUM_CONF'"
|
||||
\cp "$SRC_YUM_CONF" "$CENGN_YUM_CONF"
|
||||
mkdir -p "$STX_MIRROR_REPOS_DIR"
|
||||
echo "\cp -r '$SRC_REPO_DIR/*' '$STX_MIRROR_REPOS_DIR/'"
|
||||
\cp -r "$SRC_REPO_DIR"/* "$STX_MIRROR_REPOS_DIR/"
|
||||
echo "\cp '$SRC_YUM_CONF' '$STX_MIRROR_YUM_CONF'"
|
||||
\cp "$SRC_YUM_CONF" "$STX_MIRROR_YUM_CONF"
|
||||
|
||||
if [ "$LAYER" != "all" ]; then
|
||||
if [ -d ${MAKE_STX_MIRROR_YUM_CONF_DIR}/config/${DISTRO}/${LAYER}/yum.repos.d ]; then
|
||||
\cp -f ${MAKE_STX_MIRROR_YUM_CONF_DIR}/config/${DISTRO}/${LAYER}/yum.repos.d/*.repo $CENGN_REPOS_DIR
|
||||
\cp -f ${MAKE_STX_MIRROR_YUM_CONF_DIR}/config/${DISTRO}/${LAYER}/yum.repos.d/*.repo $STX_MIRROR_REPOS_DIR
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# Add or modify reposdir= value in our new yum.conf
|
||||
#
|
||||
if grep -q '^reposdir=' $CENGN_YUM_CONF; then
|
||||
if grep -q '^reposdir=' $STX_MIRROR_YUM_CONF; then
|
||||
# reposdir= already exists, modify it
|
||||
if [ $RETAIN_REPODIR -eq 1 ]; then
|
||||
# Append CENGN_REPOS_DIR
|
||||
sed "s#^reposdir=\(.*\)\$#reposdir=\1 $CENGN_REPOS_DIR#" -i $CENGN_YUM_CONF
|
||||
# Append STX_MIRROR_REPOS_DIR
|
||||
sed "s#^reposdir=\(.*\)\$#reposdir=\1 $STX_MIRROR_REPOS_DIR#" -i $STX_MIRROR_YUM_CONF
|
||||
else
|
||||
# replace with CENGN_REPOS_DIR
|
||||
sed "s#^reposdir=.*\$#reposdir=$CENGN_REPOS_DIR#" -i $CENGN_YUM_CONF
|
||||
# replace with STX_MIRROR_REPOS_DIR
|
||||
sed "s#^reposdir=.*\$#reposdir=$STX_MIRROR_REPOS_DIR#" -i $STX_MIRROR_YUM_CONF
|
||||
fi
|
||||
else
|
||||
# reposdir= doeas not yet exist, add it
|
||||
if [ $RETAIN_REPODIR -eq 1 ]; then
|
||||
# Add both SRC_REPO_DIR and CENGN_REPOS_DIR
|
||||
echo "reposdir=$SRC_REPO_DIR $CENGN_REPOS_DIR" >> $CENGN_YUM_CONF
|
||||
# Add both SRC_REPO_DIR and STX_MIRROR_REPOS_DIR
|
||||
echo "reposdir=$SRC_REPO_DIR $STX_MIRROR_REPOS_DIR" >> $STX_MIRROR_YUM_CONF
|
||||
else
|
||||
# Add CENGN_REPOS_DIR only
|
||||
echo "reposdir=$CENGN_REPOS_DIR" >> $CENGN_YUM_CONF
|
||||
# Add STX_MIRROR_REPOS_DIR only
|
||||
echo "reposdir=$STX_MIRROR_REPOS_DIR" >> $STX_MIRROR_YUM_CONF
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
# modify or add logfile= value in our new yum.conf
|
||||
#
|
||||
if grep -q '^logfile=' $CENGN_YUM_CONF; then
|
||||
sed "s#^logfile=.*\$#logfile=$CENGN_YUM_LOG#" -i $CENGN_YUM_CONF
|
||||
if grep -q '^logfile=' $STX_MIRROR_YUM_CONF; then
|
||||
sed "s#^logfile=.*\$#logfile=$STX_MIRROR_YUM_LOG#" -i $STX_MIRROR_YUM_CONF
|
||||
else
|
||||
echo "logfile=$CENGN_YUM_LOG" >> $CENGN_YUM_CONF
|
||||
echo "logfile=$STX_MIRROR_YUM_LOG" >> $STX_MIRROR_YUM_CONF
|
||||
fi
|
||||
|
||||
#
|
||||
# modify or add cachedir= value in our new yum.conf
|
||||
#
|
||||
if grep -q '^cachedir=' $CENGN_YUM_CONF; then
|
||||
sed "s#^cachedir=.*\$#cachedir=$CENGN_YUM_CACHDIR#" -i $CENGN_YUM_CONF
|
||||
if grep -q '^cachedir=' $STX_MIRROR_YUM_CONF; then
|
||||
sed "s#^cachedir=.*\$#cachedir=$STX_MIRROR_YUM_CACHDIR#" -i $STX_MIRROR_YUM_CONF
|
||||
else
|
||||
echo "cachedir=$CENGN_YUM_CACHDIR" >> $CENGN_YUM_CONF
|
||||
echo "cachedir=$STX_MIRROR_YUM_CACHDIR" >> $STX_MIRROR_YUM_CONF
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# Modify all the repo files in our new yum.repos.d
|
||||
#
|
||||
for REPO in $(find "$CENGN_REPOS_DIR" -type f -name '*repo'); do
|
||||
for REPO in $(find "$STX_MIRROR_REPOS_DIR" -type f -name '*repo'); do
|
||||
#
|
||||
# Replace mirrorlist with baseurl if required
|
||||
#
|
||||
|
|
@ -246,37 +246,37 @@ for REPO in $(find "$CENGN_REPOS_DIR" -type f -name '*repo'); do
|
|||
sed '/^gpgkey=/d' -i "$REPO"
|
||||
|
||||
#
|
||||
# Convert baseurl(s) to cengn equivalent
|
||||
# Convert baseurl(s) to StarlingX mirror equivalent
|
||||
#
|
||||
for URL in $(grep '^baseurl=' "$REPO" | sed 's#^baseurl=##'); do
|
||||
CENGN_URL="$(url_to_stx_mirror_url "$URL" "$DISTRO")"
|
||||
STX_MIRROR_URL="$(url_to_stx_mirror_url "$URL" "$DISTRO")"
|
||||
|
||||
# Test CENGN url
|
||||
url_exists --quiet "$CENGN_URL"
|
||||
# Test STX_MIRROR url
|
||||
url_exists --quiet "$STX_MIRROR_URL"
|
||||
if [ $? -eq 0 ]; then
|
||||
# OK, make substitution
|
||||
sed "s#^baseurl=$URL\$#baseurl=$CENGN_URL#" -i "$REPO"
|
||||
sed "s#^baseurl=$URL\$#baseurl=$STX_MIRROR_URL#" -i "$REPO"
|
||||
fi
|
||||
done
|
||||
|
||||
#
|
||||
# Prefix repoid and name with CENGN
|
||||
# Prefix repoid and name with STX_MIRROR
|
||||
#
|
||||
sed "s#^name=\(.*\)#name=CENGN_\1#" -i "$REPO"
|
||||
sed "s#^\[\([^]]*\)\]#[CENGN_\1]#" -i "$REPO"
|
||||
sed "s#^name=\(.*\)#name=STX_MIRROR_\1#" -i "$REPO"
|
||||
sed "s#^\[\([^]]*\)\]#[STX_MIRROR_\1]#" -i "$REPO"
|
||||
done
|
||||
|
||||
for key in "${!layer_urls[@]}"; do
|
||||
lower_layer="${key%,*}"
|
||||
build_type="${key#*,}"
|
||||
REPO="$CENGN_REPOS_DIR/StarlingX_cengn_${lower_layer}_layer.repo"
|
||||
REPO="$STX_MIRROR_REPOS_DIR/StarlingX_mirror_${lower_layer}_layer.repo"
|
||||
if [ -f "$REPO" ]; then
|
||||
sed "s#^baseurl=.*/${lower_layer}/.*/${build_type}/\$#baseurl=${layer_urls[${key}]}#" -i "$REPO"
|
||||
else
|
||||
REPO="$CENGN_REPOS_DIR/StarlingX_local_${lower_layer}_${build_type}_layer.repo"
|
||||
REPO="$STX_MIRROR_REPOS_DIR/StarlingX_local_${lower_layer}_${build_type}_layer.repo"
|
||||
(
|
||||
echo "[Starlingx-local_${lower_layer}_${build_type}_layer]"
|
||||
echo "name=Starlingx-cengn_${lower_layer}_${build_type}_layer"
|
||||
echo "name=Starlingx-mirror_${lower_layer}_${build_type}_layer"
|
||||
echo "baseurl=${layer_urls[${key}]}"
|
||||
echo "enabled=1"
|
||||
) > "$REPO"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
# Update script for mirror.starlingx.cengn.ca covering
|
||||
# Update script for mirror.starlingx.windriver.com covering
|
||||
# tarballs and other files not downloaded from a yum repository.
|
||||
# The list of files to download are pulled from the .lst files
|
||||
# found in the stx-tools repo.
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@
|
|||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
# Update script for mirror.starlingx.cengn.ca covering
|
||||
# Update script for mirror.starlingx.windriver.com covering
|
||||
# rpms and src.rpms downloaded from a yum repository.
|
||||
#
|
||||
# IMPORTANT: This script is only to be run on the StarlingX mirror.
|
||||
# It is not for use by the general StarlinX developer.
|
||||
#
|
||||
# Configuration files for repositories to be downloaded are currently
|
||||
# stored at mirror.starlingx.cengn.ca:/export/config/yum.repos.d.
|
||||
# stored at mirror.starlingx.windriver.com:/export/config/yum.repos.d.
|
||||
# Those repos were derived from those found in
|
||||
# stx-tools/centos-mirror-tools/yum.repos.d with some modifications.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@
|
|||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
# Update script for mirror.starlingx.cengn.ca covering
|
||||
# Update script for mirror.starlingx.windriver.com covering
|
||||
# yum.repos.d.
|
||||
#
|
||||
# IMPORTANT: This script is only to be run on the StarlingX mirror.
|
||||
# It is not for use by the general StarlinX developer.
|
||||
#
|
||||
# Configuration files for repositories to be downloaded are currently
|
||||
# stored at mirror.starlingx.cengn.ca:/export/config/yum.repos.d/
|
||||
# stored at mirror.starlingx.windriver.com:/export/config/yum.repos.d/
|
||||
# and /export/config/rpm-gpg-keys. These configuration files need
|
||||
# to be updated periodically to reflect changes made to
|
||||
# stx-tools/centos-mirror-tools/yum.repos.d/ and
|
||||
# stx-tools/centos-mirror-tools/rpm-gpg-keys/.
|
||||
# The update are additive in nature, mirror.starlingx.cengn.ca
|
||||
# The update are additive in nature, mirror.starlingx.windriver.com
|
||||
# does not delete keys or repos. At worst we will rename a
|
||||
# repo if it's url has changed.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -234,10 +234,10 @@ repo_url_to_sub_path () {
|
|||
return 0
|
||||
}
|
||||
|
||||
CENGN_PROTOCOL="http"
|
||||
CENGN_HOST="mirror.starlingx.cengn.ca"
|
||||
CENGN_PORT="80"
|
||||
CENGN_URL_ROOT="mirror"
|
||||
STX_MIRROR_PROTOCOL="https"
|
||||
STX_MIRROR_HOST="mirror.starlingx.windriver.com"
|
||||
STX_MIRROR_PORT="80"
|
||||
STX_MIRROR_URL_ROOT="mirror"
|
||||
|
||||
url_to_stx_mirror_url () {
|
||||
local URL="$1"
|
||||
|
|
@ -262,6 +262,6 @@ url_to_stx_mirror_url () {
|
|||
return 1
|
||||
fi
|
||||
|
||||
echo "$CENGN_PROTOCOL://$CENGN_HOST:$CENGN_PORT/$CENGN_URL_ROOT/$DISTRO/$URL_PATH"
|
||||
echo "$STX_MIRROR_PROTOCOL://$STX_MIRROR_HOST:$STX_MIRROR_PORT/$STX_MIRROR_URL_ROOT/$DISTRO/$URL_PATH"
|
||||
return 0
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ gpgcheck=1
|
|||
gpgkey=http://download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/CentOS_7/repodata/repomd.xml.key
|
||||
enabled=0
|
||||
|
||||
[CENGN_katacontainers_releases_x86_64_stable-1.11]
|
||||
name=Branch project for Kata Containers branch stable-1.11 (CentOS_7) CENGN
|
||||
[STX_MIRROR_katacontainers_releases_x86_64_stable-1.11]
|
||||
name=Branch project for Kata Containers branch stable-1.11 (CentOS_7) STX_MIRROR
|
||||
type=rpm-md
|
||||
baseurl=http://mirror.starlingx.cengn.ca/mirror/centos/download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/CentOS_7/
|
||||
baseurl=https://mirror.starlingx.windriver.com/mirror/centos/download.opensuse.org/repositories/home:/katacontainers:/releases:/x86_64:/stable-1.11/CentOS_7/
|
||||
gpgcheck=0
|
||||
enabled=1
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
# Builds a summary of git repos and SHAs for a particular build based on
|
||||
# manifest/default.xml and the build output script CONTEXT.sh
|
||||
#
|
||||
# Loads the CONTEXT.sh script from a StarlingX CenGN build and merge it with
|
||||
# Loads the CONTEXT.sh script from a StarlingX build and merge it with
|
||||
# a default.xml manifest to build a YAML file that describes a set of
|
||||
# git repositories and their specific configuration for a build.
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue