openstack/tripleo-ci
Code Issues Proposed changes

Merge "Conditional nodepool logic"

Browse Source
This commit is contained in:
Jenkins 2017-07-25 11:03:21 +00:00 committed by Gerrit Code Review
commit 7ff9cd7f12
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/tripleo.sh
View File

@ -1495,9 +1495,6 @@ function setup_nodepool_files {
echo $PRIMARY_NODE_IP > /etc/nodepool/node
echo $PRIMARY_NODE_IP > /etc/nodepool/node_private
echo "NODEPOOL_REGION=$NODEPOOL_REGION" > /etc/nodepool/provider
echo "NODEPOOL_CLOUD=$NODEPOOL_CLOUD" >> /etc/nodepool/provider
log "Setup nodepool files - DONE"
}

32
toci_gate_test-oooq.sh
View File

@ -16,30 +16,32 @@ fi
source $TRIPLEO_ROOT/tripleo-ci/scripts/oooq_common_functions.sh
# this sets
# NODEPOOL_PROVIDER (e.g tripleo-test-cloud-rh1)
# NODEPOOL_CLOUD (e.g.tripleo-test-cloud-rh1)
# NODEPOOL_REGION (e.g. regionOne)
# NODEPOOL_AZ
source /etc/nodepool/provider
if [ -f /etc/nodepool/provider ] ; then
# this sets
# NODEPOOL_PROVIDER (e.g tripleo-test-cloud-rh1)
# NODEPOOL_CLOUD (e.g.tripleo-test-cloud-rh1)
# NODEPOOL_REGION (e.g. regionOne)
# NODEPOOL_AZ
source /etc/nodepool/provider
# source variables common across all the scripts.
source /etc/ci/mirror_info.sh
# source variables common across all the scripts.
source /etc/ci/mirror_info.sh
# set up distribution mirrors in openstack
NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}
NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
export CENTOS_MIRROR=http://$NODEPOOL_MIRROR_HOST/centos
export EPEL_MIRROR=http://$NODEPOOL_MIRROR_HOST/epel
# set up distribution mirrors in openstack
NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}
NODEPOOL_MIRROR_HOST=$(echo $NODEPOOL_MIRROR_HOST|tr '[:upper:]' '[:lower:]')
export CENTOS_MIRROR=http://$NODEPOOL_MIRROR_HOST/centos
export EPEL_MIRROR=http://$NODEPOOL_MIRROR_HOST/epel
# host setup
if [ $NODEPOOL_CLOUD == 'tripleo-test-cloud-rh1' ]; then
# host setup
if [ $NODEPOOL_CLOUD == 'tripleo-test-cloud-rh1' ]; then
source $(dirname $0)/scripts/rh1.env
# In order to save space remove the cached git repositories, at this point in
# CI the ones we are interested in have been cloned to /opt/stack/new. We
# can also remove some distro images cached on the images.
sudo rm -rf /opt/git /opt/stack/cache/files/mysql.qcow2 /opt/stack/cache/files/ubuntu-12.04-x86_64.tar.gz
fi
fi
# create logs dir (check if collect-logs doesn't already do this)

4
toci_gate_test-orig.sh
View File

@ -3,8 +3,8 @@ set -eux
export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
# Mirrors
# NOTE(pabelanger): We have access to AFS mirrors, lets use them.
source /etc/nodepool/provider
source /etc/ci/mirror_info.sh
[ -f /etc/nodepool/provider ] && source /etc/nodepool/provider
[ -f /etc/ci/mirror_info.sh ] && source /etc/ci/mirror_info.sh
source $(dirname $0)/scripts/common_vars.bash
NODEPOOL_MIRROR_HOST=${NODEPOOL_MIRROR_HOST:-mirror.$NODEPOOL_REGION.$NODEPOOL_CLOUD.openstack.org}