X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-deploy-openstack-run-test.sh;h=06ebf1094f220867e025d8cb4c8878ded6f83e58;hb=c4f5571795775e56ec9bef76c40247c4c34cd755;hp=f74e416bc0d2bcf2976fac95c4505396f30c4160;hpb=ea91a1744b396eddb8102a197942b2773be29318;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index f74e416bc..06ebf1094 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -4,17 +4,27 @@ # script. # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091 source ${ROBOT_VENV}/bin/activate +source /tmp/common-functions.sh ${BUNDLEFOLDER} + PYTHON="${ROBOT_VENV}/bin/python" SSH="ssh -t -t" ADMIN_PASSWORD="admin" OPENSTACK_MASTER_CLIENTS_VERSION="queens" # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level -echo "showing recent changes that made it in to the distribution used by this job" +printf "\nshowing recent changes that made it into the distribution used by this job:\n" $PYTHON -m pip install --upgrade urllib3 python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folder \ -u ${ACTUAL_BUNDLE_URL} -b ${DISTROBRANCH} \ -r ssh://jenkins-${SILO}@git.opendaylight.org:29418 || true + +printf "\nshowing recent changes that made it into integration/test used by this job:\n" +cd ${WORKSPACE}/test +printf "Hash Author Date Commit Date Author Subject" +printf "------- ------------------------------ ------------------------------ -------------------- -----------------------------" +git --no-pager log --pretty=format:'%h %<(30)%ad%<(30)%cd %<(20,trunc)%an%d %s' -n20 +cd - + cat << EOF ################################################# ## Deploy Openstack 3-node ## @@ -105,7 +115,9 @@ function create_etc_hosts() { # openstack release function install_openstack_clients_in_robot_vm() { packages=("python-novaclient" "python-neutronclient" "python-openstackclient") - for plugin_name in ${ENABLE_OS_PLUGINS}; do + local os_plugins + os_plugins=$(csv2ssv "${ENABLE_OS_PLUGINS}") + for plugin_name in $os_plugins; do if [ "$plugin_name" == "networking-sfc" ]; then packages+=("networking-sfc") fi @@ -130,18 +142,6 @@ function install_openstack_clients_in_robot_vm() { fi } - - -# convert commas in csv strings to spaces (ssv) -function csv2ssv() { - local csv=$1 - if [ -n "${csv}" ]; then - ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g') - fi - - echo "${ssv}" -} # csv2ssv - function is_openstack_feature_enabled() { local feature=$1 for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES}) @@ -154,17 +154,38 @@ function is_openstack_feature_enabled() { echo 0 } -function fix_libvirt_version_n_cpu_ocata() { +function fix_libvirt_version_n_cpu_pike() { local ip=$1 ${SSH} ${ip} " cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; - git checkout stable/ocata; - sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt + git checkout stable/pike; + sed -i s/libvirt-python===3.5.0/libvirt-python===4.2.0/ upper-constraints.txt " } +#Function to install rdo release +# This will help avoiding installing wrong version of packages which causes +# functionality failures +function install_rdo_release() { + local ip=$1 + case ${OPENSTACK_BRANCH} in + *pike*) + ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-pike/rdo-release-pike-1.noarch.rpm" + ;; + + *queens*) + ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm" + ;; + + master) + ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm" + ;; + esac +} + + # Add enable_services and disable_services to the local.conf function add_os_services() { local core_services=$1 @@ -206,6 +227,8 @@ USE_SCREEN=True SCREEN_LOGDIR=/opt/stack/data/log LOG_COLOR=False RECLONE=${RECLONE} +# Increase the wait used by stack to poll for services +SERVICE_TIMEOUT=120 disable_all_services EOF @@ -251,7 +274,6 @@ EOF if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then echo "ODL_V2DRIVER=True" >> ${local_conf_file_name} fi - IFS=, for plugin_name in ${ENABLE_OS_PLUGINS}; do if [ "$plugin_name" == "networking-odl" ]; then @@ -262,7 +284,8 @@ EOF ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}" IS_LBAAS_PLUGIN_ENABLED="yes" elif [ "$plugin_name" == "networking-sfc" ]; then - ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}" + ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master" + IS_SFC_PLUGIN_ENABLED="yes" else echo "Error: Invalid plugin $plugin_name, unsupported" continue @@ -302,6 +325,9 @@ EOF if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then SERVICE_PLUGINS+=", lbaasv2" fi + if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then + SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin" + fi fi #check for ODL_ENABLE_L3_FWD cat >> ${local_conf_file_name} << EOF @@ -352,6 +378,8 @@ LOG_COLOR=False USE_SCREEN=True SCREEN_LOGDIR=/opt/stack/data/log RECLONE=${RECLONE} +# Increase the wait used by stack to poll for the nova service on the control node +NOVA_READY_TIMEOUT=1800 disable_all_services EOF @@ -359,8 +387,6 @@ EOF add_os_services "${CORE_OS_COMPUTE_SERVICES}" "${ENABLE_OS_COMPUTE_SERVICES}" "${DISABLE_OS_SERVICES}" "${local_conf_file_name}" cat >> ${local_conf_file_name} << EOF -#Added to make Nova wait until nova in control node is ready. -NOVA_READY_TIMEOUT=1800 HOST_IP=${HOSTIP} SERVICE_HOST=${SERVICEHOST} Q_ML2_TENANT_NETWORK_TYPE=${TENANT_NETWORK_TYPE} @@ -451,30 +477,26 @@ defaults listen opendaylight bind ${MGRIP}:8080 balance source -EOF - - odlindex=1 - for odlip in ${ODL_IPS[*]}; do - cat >> ${WORKSPACE}/haproxy.cfg << EOF - server controller-${odlindex} ${odlip}:8080 check fall 5 inter 2000 rise 2 -EOF - odlindex=$((odlindex+1)) - done - cat >> ${WORKSPACE}/haproxy.cfg << EOF listen opendaylight_rest bind ${MGRIP}:8181 balance source + +listen opendaylight_websocket + bind ${MGRIP}:8185 + balance source + EOF odlindex=1 for odlip in ${ODL_IPS[*]}; do - cat >> ${WORKSPACE}/haproxy.cfg << EOF - server controller-rest-${odlindex} ${odlip}:8181 check fall 5 inter 2000 rise 2 -EOF + sed -i "/listen opendaylight$/a server controller-${odlindex} ${odlip}:8080 check fall 5 inter 2000 rise 2" ${WORKSPACE}/haproxy.cfg + sed -i "/listen opendaylight_rest$/a server controller-rest-${odlindex} ${odlip}:8181 check fall 5 inter 2000 rise 2" ${WORKSPACE}/haproxy.cfg + sed -i "/listen opendaylight_websocket$/a server controller-websocket-${odlindex} ${odlip}:8185 check fall 5 inter 2000 rise 2" ${WORKSPACE}/haproxy.cfg odlindex=$((odlindex+1)) done + echo "Dump haproxy.cfg" cat ${WORKSPACE}/haproxy.cfg @@ -497,7 +519,7 @@ EOF } # configure_haproxy_for_neutron_requests() # Collect the list of files on the hosts -function collect_files () { +function collect_files() { local -r ip=$1 local -r folder=$2 finddir=/tmp/finder @@ -516,14 +538,90 @@ function collect_files () { cp /tmp/rsync.tar.xz ${folder} } -function collect_logs () { +# List of extra services to extract from journalctl +# Add new services on a separate line, in alpha order, add \ at the end +extra_services_cntl=" \ + dnsmasq.service \ + httpd.service \ + libvirtd.service \ + openvswitch.service \ + ovs-vswitchd.service \ + ovsdb-server.service \ + rabbitmq-server.service \ +" + +extra_services_cmp=" \ + libvirtd.service \ + openvswitch.service \ + ovs-vswitchd.service \ + ovsdb-server.service \ +" + +# Collect the logs for the openstack services +# First get all the services started by devstack which would have devstack@ as a prefix +# Next get all the extra services +function collect_openstack_logs() { + local -r ip=${1} + local -r folder=${2} + local -r node_type=${3} + local oslogs="${folder}/oslogs" + + printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}\n" + rm -rf ${oslogs} + mkdir -p ${oslogs} + # There are always some logs in /opt/stack/logs and this also covers the + # pre-queens branches which always use /opt/stack/logs + rsync -avhe ssh ${ip}:/opt/stack/logs/* ${oslogs} # rsync to prevent copying of symbolic links + + # Starting with queens break out the logs from journalctl + if [ "${OPENSTACK_BRANCH}" = "stable/queens" ]; then + cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF +extra_services_cntl="${extra_services_cntl}" +extra_services_cmp="${extra_services_cmp}" + +function extract_from_journal() { + local -r services=\${1} + local -r folder=\${2} + local -r node_type=\${3} + printf "extract_from_journal folder: \${folder}, services: \${services}\n" + for service in \${services}; do + # strip anything before @ and anything after . + # devstack@g-api.service will end as g-api + service_="\${service#*@}" + service_="\${service_%.*}" + sudo journalctl -u "\${service}" > "\${folder}/\${service_}.log" + done +} + +rm -rf /tmp/oslogs +mkdir -p /tmp/oslogs +systemctl list-unit-files --all > /tmp/oslogs/systemctl.units.log 2>&1 +svcs=\$(grep devstack@ /tmp/oslogs/systemctl.units.log | awk '{print \$1}') +extract_from_journal "\${svcs}" "/tmp/oslogs" +if [ "\${node_type}" = "control" ]; then + extract_from_journal "\${extra_services_cntl}" "/tmp/oslogs" +else + extract_from_journal "\${extra_services_cmp}" "/tmp/oslogs" +fi +ls -al /tmp/oslogs +EOF + printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}, executing script\n" + cat ${WORKSPACE}/collect_openstack_logs.sh + scp ${WORKSPACE}/collect_openstack_logs.sh ${ip}:/tmp + ${SSH} ${ip} "bash /tmp/collect_openstack_logs.sh > /tmp/collect_openstack_logs.log 2>&1" + rsync -avhe ssh ${ip}:/tmp/oslogs/* ${oslogs} + scp ${ip}:/tmp/collect_openstack_logs.log ${oslogs} + fi +} + +function collect_logs() { set +e # We do not want to create red dot just because something went wrong while fetching logs. cat > extra_debug.sh << EOF echo -e "/usr/sbin/lsmod | /usr/bin/grep openvswitch\n" /usr/sbin/lsmod | /usr/bin/grep openvswitch -echo -e "\ngrep ct_ /var/log/openvswitch/ovs-vswitchd.log\n" -grep "Datapath supports" /var/log/openvswitch/ovs-vswitchd.log +echo -e "\nsudo grep ct_ /var/log/openvswitch/ovs-vswitchd.log\n" +sudo grep "Datapath supports" /var/log/openvswitch/ovs-vswitchd.log echo -e "\nsudo netstat -punta\n" sudo netstat -punta echo -e "\nsudo getenforce\n" @@ -586,6 +684,7 @@ EOF ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log # Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log + mv /tmp/odl${i}_exceptions.txt ${NODE_FOLDER} rm ${NODE_FOLDER}/odl${i}_karaf.log.tar mv *_threads* ${NODE_FOLDER} mv ps_* ${NODE_FOLDER} @@ -601,7 +700,7 @@ EOF NODE_FOLDER="control_${i}" mkdir -p ${NODE_FOLDER} scp extra_debug.sh ${!OSIP}:/tmp - ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log" + ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1" scp ${!OSIP}:/etc/dnsmasq.conf ${NODE_FOLDER} scp ${!OSIP}:/etc/keystone/keystone.conf ${NODE_FOLDER} scp ${!OSIP}:/etc/keystone/keystone-uwsgi-admin.ini ${NODE_FOLDER} @@ -630,8 +729,6 @@ EOF scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER} scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER} scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER} - scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER} - scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER} collect_files "${!OSIP}" "${NODE_FOLDER}" ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log rabbitmq | xz -T 0 > /tmp/rabbitmq.tar.xz " scp ${!OSIP}:/tmp/rabbitmq.tar.xz ${NODE_FOLDER} @@ -640,8 +737,10 @@ EOF rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER} rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone_access.log ${NODE_FOLDER} rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone.log ${NODE_FOLDER} - rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages ${NODE_FOLDER} - rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links + rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER} + rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER} + rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER} + collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "control" mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf # qdhcp files are created by robot tests and copied into /tmp/qdhcp during the test tar -cf - -C /tmp qdhcp | xz -T 0 > /tmp/qdhcp.tar.xz @@ -656,7 +755,7 @@ EOF NODE_FOLDER="compute_${i}" mkdir -p ${NODE_FOLDER} scp extra_debug.sh ${!OSIP}:/tmp - ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log" + ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log 2>&1" scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER} scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER} scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER} @@ -670,16 +769,16 @@ EOF scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER} scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER} scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER} - scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER} - scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER} collect_files "${!OSIP}" "${NODE_FOLDER}" ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log libvirt | xz -T 0 > /tmp/libvirt.tar.xz " scp ${!OSIP}:/tmp/libvirt.tar.xz ${NODE_FOLDER} rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER} rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER} - rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages ${NODE_FOLDER} + rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages* ${NODE_FOLDER} rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/nova-agent.log ${NODE_FOLDER} - rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links + rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER} + rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER} + collect_openstack_logs "${!OSIP}" "${NODE_FOLDER}" "compute" mv local.conf_compute_${!OSIP} ${NODE_FOLDER}/local.conf mv ${NODE_FOLDER} ${WORKSPACE}/archives/ done @@ -695,9 +794,6 @@ EOF mkdir -p ${TEMPEST_LOGS_DIR} scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR} scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR} - if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "queens" ]; then - mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR} - fi else echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0" fi @@ -779,12 +875,7 @@ function is_rabbitmq_ready() { local -r ip=${1} local grepfor="nova_cell1" rm -f rabbit.txt - if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then - ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt - grepfor="pid" - else - ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt - fi + ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt grep ${grepfor} rabbit.txt } @@ -897,12 +988,23 @@ if [ -n "${DEVSTACK_HASH}" ]; then echo "git checkout ${DEVSTACK_HASH}" git checkout ${DEVSTACK_HASH} fi -git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s\n%b' -n20 +echo "workaround: Restore NEUTRON_CREATE_INITIAL_NETWORKS flag" +if [ "${OPENSTACK_BRANCH}" == "stable/queens" ]; then + git config --local user.email jenkins@opendaylight.org + git config --local user.name jenkins + git fetch https://git.openstack.org/openstack-dev/devstack refs/changes/99/550499/1 && git cherry-pick FETCH_HEAD +fi +git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s%b' -n20 +echo echo "workaround: adjust wait from 60s to 1800s (30m)" sed -i 's/wait_for_compute 60/wait_for_compute 1800/g' /opt/stack/devstack/lib/nova # TODO: modify sleep 1 to sleep 60, search wait_for_compute, then first sleep 1 # that would just reduce the number of logs in the compute stack.log +echo "workaround: do not upgrade openvswitch" +sudo yum install -y yum-plugin-versionlock +sudo yum versionlock add openvswitch + #Install qemu-img command in Control Node for Pike echo "Install qemu-img application" sudo yum install -y qemu-img @@ -960,14 +1062,10 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron" ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron" fi - if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then - echo "Updating requirements for ${ODL_ML2_BRANCH}" - echo "Workaround for https://review.openstack.org/#/c/491032/" - echo "Modify upper-constraints to use libvirt-python 3.2.0" - fix_libvirt_version_n_cpu_ocata ${!CONTROLIP} - fi create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}" scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf + echo "Install rdo release to avoid incompatible Package versions" + install_rdo_release ${!CONTROLIP} echo "Stack the control node ${i} of ${NUM_OPENSTACK_CONTROL_NODES}: ${CONTROLIP}" ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &" ssh ${!CONTROLIP} "ps -ef | grep stack.sh" @@ -1015,14 +1113,16 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts scp ${WORKSPACE}/get_devstack.sh ${!COMPUTEIP}:/tmp ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1" - if [ "${ODL_ML2_BRANCH}" == "stable/ocata" ]; then + if [ "${ODL_ML2_BRANCH}" == "stable/pike" ]; then echo "Updating requirements for ${ODL_ML2_BRANCH}" - echo "Workaround for https://review.openstack.org/#/c/491032/" - echo "Modify upper-constraints to use libvirt-python 3.2.0" - fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP} + echo "Workaround for libvirt-python failing installation" + echo "Modify upper-constraints to use libvirt-python 4.2.0" + fix_libvirt_version_n_cpu_pike ${!COMPUTEIP} fi create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}" scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf + echo "Install rdo release to avoid incompatible Package versions" + install_rdo_release ${!COMPUTEIP} echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}" ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &" ssh ${!COMPUTEIP} "ps -ef | grep stack.sh" @@ -1104,13 +1204,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do echo "sleep for 60s and print hypervisor-list" sleep 60 - # In Ocata if we do not enable the n-cpu in control node then - # we need to discover hosts manually and ensure that they are mapped to cells. - # reference: https://ask.openstack.org/en/question/102256/how-to-configure-placement-service-for-compute-node-on-ocata/ - if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then - scp ${WORKSPACE}/setup_host_cell_mapping.sh ${!CONTROLIP}:/tmp - ${SSH} ${!CONTROLIP} "sudo bash /tmp/setup_host_cell_mapping.sh" - fi ${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list" # in the case that we are doing openstack (control + compute) all in one node, then the number of hypervisors # will be the same as the number of openstack systems. However, if we are doing multinode openstack then the @@ -1128,12 +1221,14 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do exit 1 fi - # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node - # this needs to happen after devstack runs because it seems devstack is pulling in specific versions - # of these libs that are not working for tempest. - ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip" - ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade" - ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade" + if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then + # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node + # this needs to happen after devstack runs because it seems devstack is pulling in specific versions + # of these libs that are not working for tempest. + ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip" + ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade" + ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade" + fi # Gather Compute IPs for the site for j in `seq 1 ${NUM_COMPUTES_PER_SITE}`; do @@ -1321,6 +1416,7 @@ for suite in ${SUITES}; do -v HA_PROXY_2_IP:${HA_PROXY_2_IP} \ -v HA_PROXY_3_IP:${HA_PROXY_3_IP} \ -v JDKVERSION:${JDKVERSION} \ + -v JENKINS_WORKSPACE:${WORKSPACE} \ -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \ -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \ -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \