PYTHON="${ROBOT_VENV}/bin/python"
SSH="ssh -t -t"
ADMIN_PASSWORD="admin"
-OPENSTACK_MASTER_CLIENTS_VERSION="pike"
+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
+git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10
+cd -
+
cat << EOF
#################################################
## Deploy Openstack 3-node ##
local prog="$0"
local lastline="$1"
local lasterr="$2"
- echo "${prog}: line ${lastline}: exit status of last command: ${lasterr}"
- echo "command: ${BASH_COMMAND}"
+ echo "trap_hanlder: ${prog}: line ${lastline}: exit status of last command: ${lasterr}"
+ echo "trap_handler: command: ${BASH_COMMAND}"
collect_logs
exit 1
} # trap_handler()
fi
}
-
-
# convert commas in csv strings to spaces (ssv)
function csv2ssv() {
local csv=$1
cat >> ${local_conf_file_name} << EOF
enable_plugin networking-l2gw ${NETWORKING_L2GW_DRIVER} ${ODL_ML2_BRANCH}
-NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver.OpenDaylightL2gwDriver:default
+NETWORKING_L2GW_SERVICE_DRIVER=L2GW:OpenDaylight:networking_odl.l2gateway.driver_v2.OpenDaylightL2gwDriver:default
EOF
fi
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}
} # 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
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"
mkdir -p ${WORKSPACE}/archives
mv /tmp/changes.txt ${WORKSPACE}/archives
+ mv ${WORKSPACE}/rabbit.txt ${WORKSPACE}/archives
sleep 5
# FIXME: Do not create .tar and gzip before copying.
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}
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}
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
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}
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
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)" != "master" ]; then
+ if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "queens" ]; then
mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR}
fi
else
# Check if rabbitmq is ready by looking for a pid in it's status.
# The function returns the status of the grep command which callers can check.
function is_rabbitmq_ready() {
- local -r ip=$1
+ local -r ip=${1}
+ local grepfor="nova_cell1"
rm -f rabbit.txt
- ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt
- grep pid 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
+ grep ${grepfor} rabbit.txt
}
# retry the given command ($3) until success for a number of iterations ($1)
# sleeping ($2) between tries.
function retry() {
- set +e
local -r -i max_tries=${1}
local -r -i sleep_time=${2}
local -r cmd=${3}
fi
fi
done
- set -e
return ${rc}
}
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
#Workaround For Queens, Make the physical Network as physnet1 in lib/neutron
#Workaround Comment out creating initial Networks in lib/neutron
${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1"
- if [ "${ODL_ML2_BRANCH}" == "master" ]; then
+ if [ "${ODL_ML2_BRANCH}" == "stable/queens" ]; then
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
# Compare that timestamp to this log in the control stack.log: sudo rabbitmqctl set_permissions -p nova_cell1 stackrabbit
# If the n-cpu.log is earlier than the control stack.log timestamp then the failure condition is likely hit.
if [ ${NUM_OPENSTACK_COMPUTE_NODES} -gt 0 ]; then
- WAIT_FOR_RABBITMQ_MINUTES=60
- echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready to allow the controller to create nova_cell1 before the computes need it"
- retry ${WAIT_FOR_RABBITMQ_MINUTES} 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
- rc=$?
- if ((${rc} == 0)); then
+ WAIT_FOR_RABBITMQ_MINUTES=60
+ echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready and nova_cell1 created to allow the controller to create nova_cell1 before the computes need it"
+ set +e
+ retry ${WAIT_FOR_RABBITMQ_MINUTES} 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
+ rc=$?
+ set -e
+ if ((${rc} == 0)); then
echo "rabbitmq is ready, starting ${NUM_OPENSTACK_COMPUTE_NODES} compute(s)"
- else
+ else
echo "rabbitmq was not ready in ${WAIT_FOR_RABBITMQ_MINUTES}m"
collect_logs
exit 1
- fi
+ fi
fi
for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
${SSH} $compute_ip "
sudo ovs-vsctl add-port $PUBLIC_BRIDGE $CONTROLPORT -- set interface $CONTROLPORT type=vxlan options:local_ip=$compute_ip options:remote_ip=${!CONTROLIP} options:dst_port=9876 options:key=flow
"
- #Compute Node - set VXLAN TEP IP for Genius Auto TZ
- ${SSH} $compute_ip "
- sudo ovs-vsctl set O . external_ids:tep-ip=${compute_ip};
- "
done
done
Code Review / releng / builder.git / blobdiff