Use CENTOS_MIRROR from provided mirror_info.sh file
Don't construct CENTOS_MIRROR env var because we have it in the file mirror_info.sh which is provided from nodepool. Remove EPEL_MIRROR because it's not used anywhere. Change-Id: I40fe8f6b2be1864b27bbe369e7da988fa7f1a0bb
This commit is contained in:
parent
7af8eb077a
commit
0ec3a9c25d
|
@ -361,7 +361,7 @@ function layer_ci_repo {
|
||||||
function echo_vars_to_deploy_env {
|
function echo_vars_to_deploy_env {
|
||||||
CALLER=$(caller)
|
CALLER=$(caller)
|
||||||
echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
||||||
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 UNDERCLOUD_HEAT_CONVERGENCE 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 OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS PREDICTABLE_PLACEMENT OPSTOOLS_REPO_ENABLED UPGRADE_ENV UNDERCLOUD_CONTAINERS BOOTSTRAP_SUBNODES_MINIMAL MULTINODE_ENV_PATH; do
|
for VAR in NODEPOOL_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 UNDERCLOUD_HEAT_CONVERGENCE 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 OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS PREDICTABLE_PLACEMENT OPSTOOLS_REPO_ENABLED UPGRADE_ENV UNDERCLOUD_CONTAINERS BOOTSTRAP_SUBNODES_MINIMAL MULTINODE_ENV_PATH; do
|
||||||
echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
||||||
done
|
done
|
||||||
for role in $OVERCLOUD_ROLES; do
|
for role in $OVERCLOUD_ROLES; do
|
||||||
|
@ -374,7 +374,7 @@ function echo_vars_to_deploy_env {
|
||||||
function echo_vars_to_deploy_env_oooq {
|
function echo_vars_to_deploy_env_oooq {
|
||||||
CALLER=$(caller)
|
CALLER=$(caller)
|
||||||
echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
||||||
for VAR in CENTOS_MIRROR http_proxy MY_IP no_proxy NODECOUNT SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TOCI_JOBTYPE JOB_NAME SUBNODES_SSH_KEY FEATURE_BRANCH BOOTSTRAP_SUBNODES_MINIMAL; do
|
for VAR in NODEPOOL_CENTOS_MIRROR http_proxy MY_IP no_proxy NODECOUNT SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TOCI_JOBTYPE JOB_NAME SUBNODES_SSH_KEY FEATURE_BRANCH BOOTSTRAP_SUBNODES_MINIMAL; do
|
||||||
echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env
|
||||||
done
|
done
|
||||||
# TODO(gcerami) uncomment this code if 3nodes jobs are implemented before the bootstrap role
|
# TODO(gcerami) uncomment this code if 3nodes jobs are implemented before the bootstrap role
|
||||||
|
|
|
@ -43,7 +43,6 @@ export UNDERCLOUD_VM_NAME=instack
|
||||||
|
|
||||||
export REMAINING_TIME=${REMAINING_TIME:-180}
|
export REMAINING_TIME=${REMAINING_TIME:-180}
|
||||||
export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-""}
|
export NODEPOOL_DOCKER_REGISTRY_PROXY=${NODEPOOL_DOCKER_REGISTRY_PROXY:-""}
|
||||||
export CENTOS_MIRROR=${CENTOS_MIRROR:-""}
|
|
||||||
|
|
||||||
# post ci chores to run at the end of ci
|
# post ci chores to run at the end of ci
|
||||||
SSH_OPTIONS='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'
|
SSH_OPTIONS='-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'
|
||||||
|
|
|
@ -11,7 +11,7 @@ source $TRIPLEO_ROOT/tripleo-ci/scripts/common_functions.sh
|
||||||
# Prevent python from buffering stdout, so timestamps are set at appropriate times
|
# Prevent python from buffering stdout, so timestamps are set at appropriate times
|
||||||
export PYTHONUNBUFFERED=true
|
export PYTHONUNBUFFERED=true
|
||||||
|
|
||||||
export DIB_DISTRIBUTION_MIRROR=$CENTOS_MIRROR
|
export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_CENTOS_MIRROR
|
||||||
export STABLE_RELEASE=${STABLE_RELEASE:-""}
|
export STABLE_RELEASE=${STABLE_RELEASE:-""}
|
||||||
|
|
||||||
# the TLS everywhere job requires the undercloud to have a domain set so it can
|
# the TLS everywhere job requires the undercloud to have a domain set so it can
|
||||||
|
|
|
@ -27,12 +27,6 @@ if [ -f /etc/nodepool/provider ] ; then
|
||||||
# source variables common across all the scripts.
|
# source variables common across all the scripts.
|
||||||
source /etc/ci/mirror_info.sh
|
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
|
|
||||||
|
|
||||||
# host setup
|
# host setup
|
||||||
export RHCLOUD=''
|
export RHCLOUD=''
|
||||||
if [ ${NODEPOOL_CLOUD:-''} == 'tripleo-test-cloud-rh1' ]; then
|
if [ ${NODEPOOL_CLOUD:-''} == 'tripleo-test-cloud-rh1' ]; then
|
||||||
|
|
|
@ -7,10 +7,6 @@ export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
|
||||||
[ -f /etc/ci/mirror_info.sh ] && source /etc/ci/mirror_info.sh
|
[ -f /etc/ci/mirror_info.sh ] && source /etc/ci/mirror_info.sh
|
||||||
|
|
||||||
source $(dirname $0)/scripts/common_vars.bash
|
source $(dirname $0)/scripts/common_vars.bash
|
||||||
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
|
|
||||||
export START_JOB_TIME=$(date +%s)
|
export START_JOB_TIME=$(date +%s)
|
||||||
|
|
||||||
if [ $NODEPOOL_CLOUD == 'tripleo-test-cloud-rh1' ]; then
|
if [ $NODEPOOL_CLOUD == 'tripleo-test-cloud-rh1' ]; then
|
||||||
|
|
Loading…
Reference in New Issue