From 332b97e4e4b5714dce88e14f27a675740d21a9b3 Mon Sep 17 00:00:00 2001 From: gvrangan Date: Wed, 1 Jun 2016 23:25:38 +0000 Subject: [PATCH] Make Openstack jobs more configurable local.conf contents are made configurable in this patch. User can select the serices to enable and disable. The entire log directory from karaf is collected for better debugging. Fixed the wrong variable in the networking-odl git line Change-Id: I6510a724aa5b939be57dbbdec82e531154b2e612 Signed-off-by: gvrangan --- ...w-integration-deploy-openstack-run-test.sh | 62 ++++++++++--------- jjb/integration/integration-templates.yaml | 24 +++++++ .../netvirt-csit-1node-multi-openstack.yaml | 8 ++- .../netvirt-csit-3node-multi-openstack.yaml | 8 ++- jjb/vtn/vtn-manager-csit-1node-openstack.yaml | 40 ++++++++++++ 5 files changed, 112 insertions(+), 30 deletions(-) create mode 100644 jjb/vtn/vtn-manager-csit-1node-openstack.yaml diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh index 6c501941f..96271a801 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -16,28 +16,34 @@ LOGFILE=stack.sh.log SCREEN_LOGDIR=/opt/stack/data/log LOG_COLOR=False RECLONE=yes +EOF -disable_service swift -disable_service cinder -disable_service n-net -disable_service q-vpn -enable_service q-svc -enable_service q-dhcp -enable_service q-meta -enable_service tempest -enable_service n-novnc -enable_service n-cauth +IFS=, +for service_name in ${DISABLE_OS_SERVICES} +do +cat >> ${local_conf_file_name} << EOF +disable_service ${service_name} +EOF +done +for service_name in ${ENABLE_OS_SERVICES} +do +cat >> ${local_conf_file_name} << EOF +enable_service ${service_name} +EOF +done +unset IFS +cat >> ${local_conf_file_name} << EOF HOST_IP=$OPENSTACK_CONTROL_NODE_IP SERVICE_HOST=\$HOST_IP NEUTRON_CREATE_INITIAL_NETWORKS=False Q_PLUGIN=ml2 -Q_ML2_TENANT_NETWORK_TYPE=vxlan +Q_ML2_TENANT_NETWORK_TYPE=${TENANT_NETWORK_TYPE} +Q_OVS_USE_VETH=True ENABLE_TENANT_TUNNELS=True - MYSQL_HOST=\$SERVICE_HOST RABBIT_HOST=\$SERVICE_HOST GLANCE_HOSTPORT=\$SERVICE_HOST:9292 @@ -50,10 +56,11 @@ SERVICE_TOKEN=service SERVICE_PASSWORD=admin ADMIN_PASSWORD=admin -enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH} +enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_VERSION} ODL_PORT=8080 ODL_MODE=externalodl +LIBVIRT_TYPE=qemu EOF @@ -150,8 +157,9 @@ SERVICE_TOKEN=service SERVICE_PASSWORD=admin ADMIN_PASSWORD=admin -enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH} +enable_plugin networking-odl ${ODL_ML2_DRIVER_REPO} ${ODL_ML2_VERSION} ODL_MODE=compute +LIBVIRT_TYPE=qemu EOF @@ -257,10 +265,6 @@ set +e # We do not want to create red dot just because something went wrong whi for i in `seq 1 ${NUM_ODL_SYSTEM}` do CONTROLLERIP=ODL_SYSTEM_${i}_IP - echo "dumping first 500K bytes of karaf log..." > "odl${i}_karaf.log" - ssh "${!CONTROLLERIP}" head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log" - echo "dumping last 500K bytes of karaf log..." >> "odl${i}_karaf.log" - ssh "${!CONTROLLERIP}" tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" >> "odl${i}_karaf.log" echo "killing karaf process..." ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh' done @@ -268,8 +272,9 @@ sleep 5 for i in `seq 1 ${NUM_ODL_SYSTEM}` do CONTROLLERIP=ODL_SYSTEM_${i}_IP - ssh "${!CONTROLLERIP}" xz -9ekvv "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" - scp "${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/data/log/karaf.log.xz" "odl${i}_karaf.log.xz" + ssh "${!CONTROLLERIP}" "mv /tmp/${BUNDLEFOLDER}/data/log/ /tmp/odl_log/" + ssh "${!CONTROLLERIP}" 'tar -cf - "/tmp/odl_log/" | xz -9 -c - > /tmp/odl_karaf_log.tar.xz' + scp "${!CONTROLLERIP}:/tmp/odl_karaf_log.tar.xz" "odl${i}_karaf.log.tar.xz" done ssh ${OPENSTACK_CONTROL_NODE_IP} "xz -9ekvv /opt/stack/devstack/nohup.out" @@ -282,6 +287,7 @@ done } cat > ${WORKSPACE}/get_devstack.sh << EOF +sudo yum update -y sudo systemctl stop firewalld sudo yum install bridge-utils -y sudo systemctl stop NetworkManager @@ -387,14 +393,14 @@ echo "Stop Firewall in Control Node for compute nodes to be able to reach the po ssh ${OPENSTACK_CONTROL_NODE_IP} "sudo systemctl stop firewalld; sudo systemctl stop iptables" echo "sleep for a minute and print hypervisor-list" sleep 60 -ssh ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list" - -#Need to disable firewalld and iptables in compute 1 node -echo "Stop Firewall in Compute 1 Node and add to hypervisor-list" -ssh ${OPENSTACK_COMPUTE_NODE_1_IP} "sudo systemctl stop firewalld; sudo systemctl stop iptables" -#Need to disable firewalld and iptables in compute 2 node -echo "Stop Firewall in Compute 2 Node and add to hypervisor-list" -ssh ${OPENSTACK_COMPUTE_NODE_2_IP} "sudo systemctl stop firewalld; sudo systemctl stop iptables" +ssh ${OPENSTACK_CONTROL_NODE_IP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list;nova-manage service list;sudo systemctl status libvirtd" + +#Need to disable firewalld and iptables in compute nodes as well +for i in `seq 1 $((NUM_OPENSTACK_SYSTEM - 1))` +do + OSIP=OPENSTACK_COMPUTE_NODE_${i}_IP + ssh "${!OSIP}" "sudo systemctl stop firewalld; sudo systemctl stop iptables" +done echo "Locating test plan to use..." testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}" diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index e2926fc10..3d73faec4 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -737,6 +737,18 @@ name: ODL_ENABLE_L3_FWD default: '{odl-enable-l3}' description: 'Enable L3 FWD in ODL for createing br-ex' + - string: + name: ENABLE_OS_SERVICES + default: '{enable-openstack-services}' + description: 'comma seperated list of services to enable' + - string: + name: DISABLE_OS_SERVICES + default: '{disable-openstack-services}' + description: 'comma seperated list of services to enable' + - string: + name: TENANT_NETWORK_TYPE + default: '{tenant-network-type}' + description: 'Tenant Network Type supported by the implementation' scm: - integration-gerrit-scm: credentials-id: '{ssh-credentials}' @@ -830,6 +842,18 @@ name: ENABLE_HAPROXY_FOR_NEUTRON default: '{enable-haproxy}' description: 'Enable HAProxy for using neutron interface as HA' + - string: + name: ENABLE_OS_SERVICES + default: '{enable-openstack-services}' + description: 'comma seperated list of services to enable' + - string: + name: DISABLE_OS_SERVICES + default: '{disable-openstack-services}' + description: 'comma seperated list of services to enable' + - string: + name: TENANT_NETWORK_TYPE + default: '{tenant-network-type}' + description: 'Tenant Network Type supported by the implementation' scm: - integration-gerrit-scm: credentials-id: '{ssh-credentials}' diff --git a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml index 1c7d2777d..14e5ddd96 100644 --- a/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-1node-multi-openstack.yaml @@ -20,7 +20,7 @@ openstack: - mitaka: openstack-branch: 'stable/mitaka' - odl-ml2-version: 'master' + odl-ml2-version: 'stable/mitaka' - liberty: openstack-branch: 'stable/liberty' odl-ml2-version: 'stable/liberty' @@ -32,3 +32,9 @@ schedule: 'H H * * *' odl-enable-l3: 'yes' + + enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest' + + disable-openstack-services: 'swift,cinder,n-net,q-vpn' + + tenant-network-type: 'vxlan' diff --git a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml index 54d4793e3..5a0261356 100644 --- a/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-3node-multi-openstack.yaml @@ -20,7 +20,7 @@ openstack: - mitaka: openstack-branch: 'stable/mitaka' - odl-ml2-version: 'master' + odl-ml2-version: 'stable/mitaka' - liberty: openstack-branch: 'stable/liberty' odl-ml2-version: 'stable/liberty' @@ -34,3 +34,9 @@ odl-enable-l3: 'yes' enable-haproxy: 'yes' + + enable-openstack-services: 'q-svc,q-dhcp,q-meta,n-cauth,tempest' + + disable-openstack-services: 'swift,cinder,n-net,q-vpn' + + tenant-network-type: 'vxlan' diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml new file mode 100644 index 000000000..4363b9402 --- /dev/null +++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml @@ -0,0 +1,40 @@ +- project: + name: vtn-manager-csit-openstack-integration + jobs: + - '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}' + + # The project name + project: 'vtn' + + # The project name + functionality: 'neutron' + + stream: + - boron: + branch: 'master' + jre: 'openjdk8' + - beryllium: + branch: 'stable/beryllium' + jre: 'openjdk7' + + openstack: + - mitaka: + openstack-branch: 'stable/mitaka' + odl-ml2-version: 'stable/mitaka' + - liberty: + openstack-branch: 'stable/liberty' + odl-ml2-version: 'stable/liberty' + + openstack-vms: 1 + + install-features: 'odl-vtn-manager-neutron,odl-restconf-all' + + schedule: 'H H * * *' + + odl-enable-l3: 'no' + + enable-openstack-services: 'n-cpu,q-agt,q-svc,q-dhcp,q-meta,n-cauth,tempest' + + disable-openstack-services: 'n-net,q-l3' + + tenant-network-type: 'local' -- 2.36.6