openstack
/
tripleo-ci
Code Issues Proposed changes

Remove EPEL usage 

Puppet OpenStack CI and RDO CI doesn't need EPEL, so this patch removes
EPEL dependency in TripleO CI.

Change-Id: I7adebb9ff6b544289bb138b5aa8736f0ded0da49
Depends-On: I91b070324eb39af351c2304e6786c395509d08dc
Depends-On: Iceff0d5bedd9816adfd2990970e7c216b67b6bd0
This commit is contained in:
Emilien Macchi 2016-07-26 13:59:58 -04:00 committed by Ben Nemec
parent 1cf4f134d5
commit fb59994a73
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/bmc-template/bmc-template.sh
View File

@ -2,9 +2,8 @@
# taken from openstack-virtual-baremetal/bin/install_openstackbmc.sh
yum -y update centos-release # required for rdo-release install to work
yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
yum install -y python-pip python2-crypto os-net-config python-novaclient python-neutronclient git jq
yum install -y python-pip python-crypto os-net-config python-novaclient python-neutronclient git jq
pip install pyghmi
# the CI cloud is using a unsafe disk caching mode, so this sync will be ignored by the host

2
scripts/common_functions.sh
View File

@ -297,7 +297,7 @@ function layer_ci_repo {
function echo_vars_to_deploy_env {
for VAR in CENTOS_MIRROR EPEL_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK PINGTEST_TEMPLATE; do
for VAR in CENTOS_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK PINGTEST_TEMPLATE; do
echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
done
}

1
scripts/deploy-server.sh
View File

@ -4,7 +4,6 @@
# to run based on the hostname e.g. to create a mirror server then one can simply
# nova boot --image <id> --flavor <id> --user-data scripts/deploy-server.sh --nic net-id=<id> --nic net-id=<id>,v4-fixed-ip=192.168.1.101 mirror-server
yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
yum install -y puppet git
echo puppetlabs-apache adrien-filemapper | xargs -n 1 puppet module install

1
scripts/deploy.sh
View File

@ -11,7 +11,6 @@ source $TRIPLEO_ROOT/tripleo-ci/scripts/metrics.bash
export PYTHONUNBUFFERED=true
export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
export DIB_EPEL_MIRROR=$EPEL_MIRROR
export STABLE_RELEASE=${STABLE_RELEASE:-""}

5
scripts/tripleo.sh
View File

@ -286,6 +286,11 @@ EOF"
# takes precedence over the main RDO repositories.
sudo yum -y install yum-plugin-priorities
# Make sure EPEL is uninstalled.
if rpm --quiet -q epel-release; then
sudo rpm -e epel-release
fi
log "Repository setup - DONE."
}

1
toci_instack.sh
View File

@ -81,7 +81,6 @@ ls /home/jenkins/.ssh/id_rsa_virt_power || ssh-keygen -f /home/jenkins/.ssh/id_r
export ANSWERSFILE=/usr/share/instack-undercloud/undercloud.conf.sample
export ELEMENTS_PATH=/usr/share/instack-undercloud
export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
export DIB_EPEL_MIRROR=$EPEL_MIRROR
export DIB_CLOUD_IMAGES=http://$MIRRORSERVER/cloud.centos.org/centos/7/images
source $TRIPLEO_ROOT/tripleo-ci/deploy.env