Merge "Add multinode jobs"

.zuul.yaml

@@ -1,8 +1,36 @@
+- nodeset:
+    name: openstack-multi-nodes
+    nodes:
+      - name: controller
+        label: ubuntu-xenial
+      - name: compute1
+        label: ubuntu-xenial
+    groups:
+      # Nodes running the compute service
+      - name: compute
+        nodes:
+          - controller
+          - compute1
+      # Nodes that are not the controller
+      - name: subnode
+        nodes:
+          - compute1
+      # Switch node for multinode networking setup
+      - name: switch
+        nodes:
+          - controller
+      # Peer nodes for multinode networking setup
+      - name: peers
+        nodes:
+          - compute1
+
+
 - job:
-    name: tacker-functional-devstack
+    name: tacker-functional-devstack-multinode
     parent: devstack
     description: |
-      Base job for devstack-based functional tests
+      Base multinodes job for devstack-based functional tests
+    nodeset: openstack-multi-nodes
     pre-run: playbooks/devstack/pre.yaml
     run: playbooks/devstack/run.yaml
     post-run: playbooks/devstack/post.yaml
@@ -24,41 +52,66 @@
       - openstack/tacker
       - openstack/tacker-horizon
     vars:
+      devstack_localrc:
+        CELLSV2_SETUP: singleconductor
+        Q_DVR_MODE: dvr
       test_matrix_configs: [neutron]
       devstack_services:
-        horizon: true
+        horizon: false
-        tacker: true
-        tacker-conductor: true
         swift: false
-      devstack_plugins:
+        s-account: false
-        heat: https://git.openstack.org/openstack/heat
+        s-container: false
-        networking-sfc: https://git.openstack.org/openstack/networking-sfc
+        s-object: false
-        aodh: https://git.openstack.org/openstack/aodh
+        s-proxy: false
-        ceilometer: https://git.openstack.org/openstack/ceilometer
+        c-bak: false
-        barbican: https://git.openstack.org/openstack/barbican
-        mistral: https://git.openstack.org/openstack/mistral
-        tacker: https://git.openstack.org/openstack/tacker
-      tox_install_siblings: false
-      tox_envlist: dsvm-functional
       zuul_work_dir: src/git.openstack.org/openstack/tacker
-
+    host-vars:
-- job:
+     controller:
-    name: tacker-functional-devstack-python3
+       devstack_plugins:
-    parent: tacker-functional-devstack
+         heat: https://git.openstack.org/openstack/heat
-    description: |
+         networking-sfc: https://git.openstack.org/openstack/networking-sfc
-      Run tacker functional tests using python3 against a master devstack
+         aodh: https://git.openstack.org/openstack/aodh
-    vars:
+         ceilometer: https://git.openstack.org/openstack/ceilometer
-      tacker_environment:
+         barbican: https://git.openstack.org/openstack/barbican
-        TACKER_TOX_PYTHON: python3
+         mistral: https://git.openstack.org/openstack/mistral
+         tacker: https://git.openstack.org/openstack/tacker
+       devstack_services:
+         horizon: false
+         swift: false
+         s-account: false
+         s-container: false
+         s-object: false
+         s-proxy: false
+         c-bak: false
+         tacker: true
+         tacker-conductor: true
+         q-svc: true
+       tox_install_siblings: false
+       tox_envlist: dsvm-functional
+    group-vars:
+      subnode:
+        devstack_localrc:
+          CELLSV2_SETUP: singleconductor
+          PHYSICAL_NETWORK: mgmtphysnet0
+        devstack_services:
+          q-agt: true
+          n-api: false
+          n-api-meta: false
+          n-cauth: false
+          n-cond: false
+          n-cpu: true
+          n-novnc: false
+          n-obj: false
+          n-sch: false
+          horizon: false
+          tls-proxy: false
 
 - project:
     check:
       jobs:
-        - tacker-functional-devstack:
+        - tacker-functional-devstack-multinode:
-            voting: false
-        - tacker-functional-devstack-python3:
             voting: false
         - openstack-tox-lower-constraints
     gate:
-      jobs:
+        jobs:
-        - openstack-tox-lower-constraints
+            - openstack-tox-lower-constraints

devstack/plugin.sh

@@ -31,8 +31,11 @@ if is_service_enabled tacker; then
         init_tacker
         echo_summary "Starting Tacker API and conductor"
         start_tacker
-        echo_summary "Installing tacker horizon"
+        if is_service_enabled horizon; then
-        tacker_horizon_install
+            echo_summary "Installing tacker horizon"
+            tacker_horizon_install
+        fi
+
         if [[ "${TACKER_MODE}" == "all" ]]; then
             echo_summary "Modifying Heat policy.json file"
             modify_heat_flavor_policy_rule
@@ -50,9 +53,11 @@ if is_service_enabled tacker; then
 
     if [[ "$1" == "unstack" ]]; then
         # Shut down tacker services
-        echo_summary "Uninstall tacker horizon"
+        if is_service_enabled horizon; then
-        tacker_horizon_uninstall
+            echo_summary "Uninstall tacker horizon"
-	stop_tacker
+            tacker_horizon_uninstall
+        fi
+        stop_tacker
     fi
 
     if [[ "$1" == "clean" ]]; then

devstack/settings

@@ -22,7 +22,9 @@ if [ "${TACKER_MODE}" == "all" ]; then
     # enable tacker-conductor will make systemctl enable conductor service
     enable_service tacker-conductor
     MGMT_PHYS_NET=${MGMT_PHYS_NET:-mgmtphysnet0}
-    BR_MGMT=${BR_MGMT:-br-mgmt0}
+    # br-infra is created by devstack multi node job
+    # http://git.openstack.org/cgit/openstack-infra/zuul-jobs/tree/roles/multi-node-bridge
+    BR_MGMT=${BR_MGMT:-br-infra}
     NET_MGMT=${NET_MGMT:-net_mgmt}
     SUBNET_MGMT=${SUBNET_MGMT:-subnet_mgmt}
     FIXED_RANGE_MGMT=${FIXED_RANGE_MGMT:-192.168.120.0/24}

playbooks/devstack/pre.yaml

@@ -1,8 +1,9 @@
 - hosts: all
   roles:
-    - run-devstack
+    - orchestrate-devstack
     - setup-default-vim
     - role: bindep
       bindep_profile: test
       bindep_dir: "{{ zuul_work_dir }}"
     - ensure-tox
+    - show-net-setup

playbooks/devstack/run.yaml

@@ -1,3 +1,3 @@
-- hosts: all
+- hosts: controller
   roles:
     - tox

roles/show-net-setup/tasks/main.yaml

@@ -0,0 +1,17 @@
+- name: Print net information
+  shell: sudo bash -c "ip address > /opt/stack/ipaddress.txt"
+
+- name: Collect net information
+  fetch:
+    flat: yes
+    dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/confs/devstack/ipaddress.txt"
+    src: "/opt/stack/ipaddress.txt"
+
+- name: print ovs information
+  shell: sudo bash -c "ovs-vsctl show > /opt/stack/ovsvsctl.txt"
+
+- name: Collect ovs information
+  fetch:
+    flat: yes
+    dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/confs/devstack/ovsvsctl.txt"
+    src: "/opt/stack/ovsvsctl.txt"