Merge "Rework experimental checks for nova-lxd"

jenkins/jobs/nova-lxd.yaml

@@ -1,5 +1,5 @@
 - job:
-    name: gate-tempest-dsvm-lxd-nv
+    name: gate-tempest-dsvm-lxd-ovs-nv
     node: ubuntu-xenial
 
     wrappers:
@@ -21,10 +21,65 @@
           export DEVSTACK_GATE_VIRT_DRIVER="lxd"
           export PROJECTS="openstack/nova-lxd $PROJECTS"
 
-          # Enable nova-lxd devstack plugin. Providede repo should be
+          # Enable nova-lxd devstack plugin. Provided repo should be
           # cloned by zuul before devstack run and below provided
           # link should not be used.
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin nova-lxd https://git.openstack.org/openstack/nova-lxd"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin nova-lxd git://git.openstack.org/openstack/nova-lxd"
+
+          # keep localrc to be able to set some vars in pre_test hook
+          export KEEP_LOCALRC=1
+
+          function pre_test_hook {
+            source $BASE/new/nova-lxd/contrib/ci/pre_test_hook.sh
+          }
+          export -f pre_test_hook
+
+          function post_test_hook {
+            source $BASE/new/nova-lxd/contrib/ci/post_test_hook.sh
+          }
+          export -f post_test_hook
+
+          export DEVSTACK_GATE_SETTINGS=/opt/stack/new/nova-lxd/devstack/tempest-dsvm-lxd-rc
+
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - test-results
+      - devstack-logs
+      - console-log
+
+- job:
+    name: gate-tempest-dsvm-lxd-linuxbridge-nv
+    node: ubuntu-xenial
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_FULL=1
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_VIRT_DRIVER="lxd"
+          export PROJECTS="openstack/nova-lxd $PROJECTS"
+
+          # Enable linuxbridge agent and configure physical network
+          export DEVSTACK_LOCAL_CONFIG="Q_AGENT=linuxbridge"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"PHYSICAL_NETWORK=default"
+
+          # Enable nova-lxd devstack plugin. Provided repo should be
+          # cloned by zuul before devstack run and below provided
+          # link should not be used.
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin nova-lxd git://git.openstack.org/openstack/nova-lxd"
 
           # keep localrc to be able to set some vars in pre_test hook
           export KEEP_LOCALRC=1

zuul/layout.yaml

@@ -13318,7 +13318,8 @@ projects:
     post:
       - nova-lxd-branch-tarball
     experimental:
-      - gate-tempest-dsvm-lxd-nv
+      - gate-tempest-dsvm-lxd-ovs-nv
+      - gate-tempest-dsvm-lxd-linuxbridge-nv
 
   - name: openstack/nova-mksproxy
     template: