x/compass-core
Code Issues Proposed changes

Switch Atomic release to remi-release

Browse Source 
- Atomic official site download speed is slow
- switching atomic release rpm to remi-release

Change-Id: I882a9a4f1986ef3730b434918d1043d3c133ae97
This commit is contained in:
Xicheng Chang 2015-07-30 11:50:32 -07:00
parent 6c0c98d54b
commit fe42570fd4
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/install.conf
View File

@ -7,6 +7,10 @@ export OS_INSTALLER=${OS_INSTALLER:-cobbler}
# PACKAGE_INSTALLER indicates the tool for Package provisioning, default is 'chef'.
export PACKAGE_INSTALLER=${PACKAGE_INSTALLER:-package}
# set remi release url
# export ATOMIC=${ATOMIC:-http://www6.atomicorp.com/channels/atomic/${IMAGE_TYPE,,}/${IMAGE_VERSION_MAJOR}/${IMAGE_ARCH}/RPMS/atomic-release-1.0-19.${IMAGE_TYPE_OTHER}${IMAGE_VERSION_MAJOR}.art.noarch.rpm}
export REMI=${REMI:-http://rpms.famillecollet.com/enterprise/remi-release-6.rpm}
# service NIC
export NIC=${NIC:-}
export IPADDR=${IPADDR:-}

4
install/install.conf.template
View File

@ -10,6 +10,10 @@ export OS_INSTALLER=cobbler
# PACKAGE_INSTALLER indicates the tool for Package provisioning, default is 'chef'.
export PACKAGE_INSTALLER=chef
# set remi release
# export ATOMIC=https://s3-us-west-1.amazonaws.com/compass-local-repo/atomic-release-1.0-19.el6.art.noarch.rpm
export REMI=http://rpms.famillecollet.com/enterprise/remi-release-6.rpm
# service NIC (A bridge "installation" is used for jenkins CI)
export NIC=installation

29
install/install.sh
View File

@ -82,21 +82,26 @@ fi
sed -i 's/^mirrorlist=https/mirrorlist=http/g' /etc/yum.repos.d/epel.repo
### Add atomic repo
sudo rpm -q atomic-release
if [ "$?" != "0" ]; then
sudo rpm -Uvh http://www6.atomicorp.com/channels/atomic/${IMAGE_TYPE,,}/${IMAGE_VERSION_MAJOR}/${IMAGE_ARCH}/RPMS/atomic-release-1.0-19.${IMAGE_TYPE_OTHER}${IMAGE_VERSION_MAJOR}.art.noarch.rpm >& /dev/null
if [ "$?" != "0" ]; then
echo "failed to install atomic-release"
exit 1
else
echo "successfully installed atomic-release"
fi
else
echo "atomic-release is already installed"
if [ "$?" == "0" ]; then
sudo rpm -e atomic-release
fi
sed -i 's/^mirrorlist=https/mirrorlist=http/g' /etc/yum.repos.d/atomic.repo
### Add remi repo
sudo rpm -q remi-release
if [ "$?" != "0" ]; then
sudo rpm -Uvh $REMI >& /dev/null
if [ "$?" != "0" ]; then
echo "failed to install remi-release"
exit 1
else
echo "successfully installed remi-release"
fi
else
echo "remi-release is already installed"
fi
# sed -i 's/^mirrorlist=https/mirrorlist=http/g' /etc/yum.repos.d/atomic.repo
### Trap any error code with related filename and line.
errtrap()