From a82cfe7ed685f88e8c6b1dffa29e269b2892a88e Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Wed, 1 Feb 2017 11:35:16 -0500 Subject: [PATCH] allow centos-opstools repo to be enabled for multinode jobs The ci tests for collectd, fluentd, and sensu all require that the centos-opstools SIG repository be enabled. We're running those tests as part of ci/environments/scenario001-multinode.yaml, so this change only enables the opstools repo for scenario001. Change-Id: I03cfbd96778a76125d18e2ca2f48d96e292608de --- scripts/common_functions.sh | 2 +- scripts/tripleo.sh | 22 ++++++++++++---------- toci_gate_test.sh | 6 ++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh index 1e25aaa20..6a0700010 100755 --- a/scripts/common_functions.sh +++ b/scripts/common_functions.sh @@ -314,7 +314,7 @@ function layer_ci_repo { function echo_vars_to_deploy_env { CALLER=$(caller) 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; 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 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; do echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env done for role in $OVERCLOUD_ROLES; do diff --git a/scripts/tripleo.sh b/scripts/tripleo.sh index b918b6130..ad3d3b19e 100755 --- a/scripts/tripleo.sh +++ b/scripts/tripleo.sh @@ -168,6 +168,12 @@ else OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF}"\ $REPO_PREFIX/CentOS-Ceph-Jewel.repo" fi +OPSTOOLS_REPO_ENABLED=${OPSTOOLS_REPO_ENABLED:-"0"} +OPSTOOLS_REPO_URL=${OPSTOOLS_REPO_URL:-"https://raw.githubusercontent.com/centos-opstools/opstools-repo/master/opstools.repo"} +if [[ "${OPSTOOLS_REPO_ENABLED}" = 1 ]]; then + OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF=${OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF}"\ + $REPO_PREFIX/centos-opstools.repo" +fi FEATURE_BRANCH=${FEATURE_BRANCH:-} DELOREAN_SETUP=${DELOREAN_SETUP:-""} DELOREAN_BUILD=${DELOREAN_BUILD:-""} @@ -193,8 +199,6 @@ TEMPEST_REGEX=${TEMPEST_REGEX:-"^(?=(.*smoke))(?!(tempest.api.orchestration.stac TEMPEST_PINNED="72ccabcb685df7c3e28cd25639b05d8a031901c8" SSH_OPTIONS=${SSH_OPTIONS:-'-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=Verbose -o PasswordAuthentication=no -o ConnectionAttempts=32'} export SCRIPTS_DIR=$(dirname ${BASH_SOURCE[0]:-$0}) -OPSTOOLS_REPO_ENABLED=${OPSTOOLS_REPO_ENABLED:-"0"} -OPSTOOLS_REPO_URL=${OPSTOOLS_REPO_URL:-"https://raw.githubusercontent.com/centos-opstools/opstools-repo/master/opstools.repo"} if [[ "${STABLE_RELEASE}" = "mitaka" ]] ; then export OS_IMAGE_API_VERSION=1 @@ -279,6 +283,11 @@ function repo_setup { CEPH_REPO_FILE=CentOS-Ceph-Jewel.repo fi + if [[ "${OPSTOOLS_REPO_ENABLED}" = 1 ]]; then + sudo curl -Lvo $REPO_PREFIX/centos-opstools.repo \ + "${OPSTOOLS_REPO_URL}" + fi + if [ $REPO_PREFIX != "/etc/yum.repos.d/" ]; then # Note yum --installroot doesn't seem to work as it can't find the extras repos in the # system yum.repos.d, so download the package then extraact the repo file @@ -534,14 +543,7 @@ except: sudo chown -R $(id -u) ~/.cache/image-create/source-repositories fi - # Enable OpsTools repository - if [[ "$OPSTOOLS_REPO_ENABLED" == "1" ]]; then - sudo curl -Lo $TRIPLEO_ROOT/opstools.repo $OPSTOOLS_REPO_URL - export DIB_YUM_REPO_CONF="$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF \ - $TRIPLEO_ROOT/opstools.repo" - else - export DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF - fi + export DIB_YUM_REPO_CONF=$OVERCLOUD_IMAGES_DIB_YUM_REPO_CONF log "Overcloud images saved in $OVERCLOUD_IMAGES_PATH" pushd $OVERCLOUD_IMAGES_PATH diff --git a/toci_gate_test.sh b/toci_gate_test.sh index 64a688ba2..c3ce60f42 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -97,10 +97,16 @@ export UNDERCLOUD_TELEMETRY=0 export UNDERCLOUD_UI=0 export UNDERCLOUD_VALIDATIONS=0 export PREDICTABLE_PLACEMENT=0 +export OPSTOOLS_REPO_ENABLED=0 if [[ $TOCI_JOBTYPE =~ scenario ]]; then export MULTINODE_ENV_NAME=${TOCI_JOBTYPE#periodic-} MULTINODE_ENV_PATH=/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml + + # enable opstools repository for scenario001 + if [[ "$MULTINODE_ENV_NAME" = scenario001-multinode ]]; then + OPSTOOLS_REPO_ENABLED=1 + fi else export MULTINODE_ENV_NAME='multinode' MULTINODE_ENV_PATH=/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml