Add COE Openstack CSIT Job

Change-Id: If5a889d2ee9c623eb94b16fa28ecb20773259ec2
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml
new file mode 100644 (file)
index 0000000..b1ef211
--- /dev/null
+++ b/jjb/coe/coe-csit-openstack.yaml
@@ -0,0 +1,53 @@
+---
+- project:
+    name: coe-csit-openstack-integration
+    jobs:
+      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
+
+    project: 'coe'
+
+    topology:
+      - 1node:
+          openstack_system_count: 3
+          odl_system_count: 1
+          enable-haproxy: 'no'
+          install-features: 'odl-netvirt-openstack'
+      - 3node:
+          openstack_system_count: 4
+          odl_system_count: 3
+          enable-haproxy: 'yes'
+          install-features: 'odl-jolokia,odl-netvirt-openstack'
+
+    testplan: '{project}-{topology}-openstack.txt'
+
+    functionality:
+      - kubernetes:
+          schedule: ''
+
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+
+    openstack:
+      - ocata:
+          openstack-branch: 'stable/ocata'
+          odl-ml2-branch: 'stable/ocata'
+          odl-ml2-driver-version: 'v2'
+          openstack_system_image: 'CentOS 7 - devstack-ocata - 20170606-0821'
+
+
+    create-initial-networks: 'True'
+
+    enable-openstack-plugins: 'networking-odl,kuryr-kubernetes,neutron-lbaas'
+
+    enable-openstack-services: >
+        q-svc,q-dhcp,q-meta,n-cauth,legacy_etcd,docker,q-lbaasv2,kubernetes-api,
+        kubernetes-controller-manager,kubernetes-scheduler,kubelet,kuryr-kubernetes
+
+    lbaas-service-provider: >
+        'LOADBALANCERV2:opendaylight:networking_odl.lbaas.driver_v2.OpenDaylightLbaasDriverV2:default'

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 13c9c624687bd8da097339b88ad6e723eae550c4..602788f47308ad406569205fa6477dcd8fabc472 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -36,6 +36,7 @@ LOGFILE=stack.sh.log
 SCREEN_LOGDIR=/opt/stack/data/log
 LOG_COLOR=False
 RECLONE=${RECLONE}
+ETCD_PORT=2379
 EOF
 
 IFS=,
@@ -57,8 +58,10 @@ if [ "$plugin_name" == "networking-odl" ]; then
     ENABLE_PLUGIN_ARGS="${ODL_ML2_DRIVER_REPO} ${ODL_ML2_BRANCH}"
 elif [ "$plugin_name" == "kuryr-kubernetes" ]; then
     ENABLE_PLUGIN_ARGS="${DEVSTACK_KUBERNETES_PLUGIN_REPO} master" # note: kuryr-kubernetes only exists in master at the moment
+    IS_KUBERNETES_PLUGIN_ENABLED="yes"
 elif [ "$plugin_name" == "neutron-lbaas" ]; then
     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}"
 else
@@ -75,6 +78,13 @@ if [ "${OPENSTACK_BRANCH}" == "master" ] || [ "${OPENSTACK_BRANCH}" == "stable/o
     # this should be moved into enabled_services for each job (but only for Ocata)
     echo "enable_service placement-api" >> ${local_conf_file_name}
 fi
+if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then # Ocata
+    # running kubernetes master against devstack ocata has some issues with etcd3 and this
+    # workaround is needed for things to work
+    if [ "$IS_KUBERNETES_PLUGIN_ENABLED" == "yes" ]; then
+        echo "disable_service etcd3" >> ${local_conf_file_name}
+    fi
+fi
 cat >> ${local_conf_file_name} << EOF
 HOST_IP=${HOSTIP}
 SERVICE_HOST=\$HOST_IP
@@ -156,22 +166,20 @@ disable_service q-l3
 PUBLIC_INTERFACE=br100
 EOF
 
+SERVICE_PLUGINS="networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin"
 if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
-cat >> ${local_conf_file_name} << EOF
-[[post-config|\$NEUTRON_CONF]]
-[DEFAULT]
-service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin
+  SERVICE_PLUGINS+=", networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin"
+fi #check for ENABLE_NETWORKING_L2GW
+if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then
+  SERVICE_PLUGINS+=", lbaasv2"
+fi #check for ENABLE_LBAAS_PLUGIN
+fi #check for ODL_ENABLE_L3_FWD
 
-EOF
-else
 cat >> ${local_conf_file_name} << EOF
 [[post-config|\$NEUTRON_CONF]]
 [DEFAULT]
-service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
+service_plugins = ${SERVICE_PLUGINS}
 EOF
-fi #check for ENABLE_NETWORKING_L2GW
-
-fi #ODL_ENABLE_L3_FWD check
 
 cat >> ${local_conf_file_name} << EOF
 [[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]]
@@ -417,7 +425,9 @@ do
     scp ${!OS_CTRL_IP}:/var/log/openvswitch/ovs-vswitchd.log ${OS_CTRL_FOLDER}/ovs-vswitchd.log
     scp ${!OS_CTRL_IP}:/etc/neutron/neutron.conf ${OS_CTRL_FOLDER}/neutron.conf
     scp ${!OS_CTRL_IP}:/etc/nova/nova.conf ${OS_CTRL_FOLDER}/nova.conf
-    scp ${!OS_CTRL_IP}:/etc/kuryr/kuryr.conf ${OS_CTRL_FOLDER}/kuryr.conf
+    scp ${!OS_CTRL_IP}:/etc/kuryr/kuryr.conf ${OS_COMPUTE_FOLDER}/kuryr.conf
+    scp ${!OS_CTRL_IP}:/etc/neutron/neutron_lbaas.conf ${OS_CTRL_FOLDER}/neutron-lbaas.conf
+    scp ${!OS_CTRL_IP}:/etc/neutron/services/loadbalancer/haproxy/lbaas_agent.ini ${OS_CTRL_FOLDER}/lbaas-agent.ini
     rsync -avhe ssh ${!OS_CTRL_IP}:/opt/stack/logs/* ${OS_CTRL_FOLDER} # rsync to prevent copying of symbolic links
     scp extra_debug.sh ${!OS_CTRL_IP}:/tmp
     ${SSH} ${!OS_CTRL_IP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"