Merge "Add job to test Nova with specific libvirt and kvm packages"

jenkins/jobs/devstack-gate.yaml

@@ -597,6 +597,43 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-nova-libvirt-kvm-apr{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - 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 PROJECTS="openstack/devstack-plugin-additional-pkg-repos $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin apr git://git.openstack.org/openstack/devstack-plugin-additional-pkg-repos"
+          # We want to test the latest libvirt with kvm version with that plugin
+          # TODO: (markus_z) rename that in the apr repo to "libvirt-kvm"
+          #       to make the chosen virtualization technology explicit.
+          export LATEST_CODEBASES=libvirt
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
+          ./safe-devstack-vm-gate-wrap.sh
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-lxc-f23{job-suffix}'
     node: 'fedora-23'

jenkins/jobs/projects.yaml

@@ -1211,6 +1211,11 @@
           node: ubuntu-trusty
           job-suffix: '-nv'
           branch-override: default
+      - '{pipeline}-tempest-dsvm-nova-libvirt-kvm-apr{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: ''
+          branch-override: default
       # Experimental jobs for testing dib images.
       - '{pipeline}-tempest-dsvm-full{job-suffix}':
           pipeline: gate

zuul/layout.yaml

@@ -1423,6 +1423,10 @@ jobs:
           - ^tox.ini$
     voting: false
 
+  - name: gate-tempest-dsvm-nova-libvirt-kvm-apr
+    branch: ^(?!stable/(kilo|liberty|mitaka)).*$
+    voting: false
+
   - name: gate-tempest-dsvm-neutron-multinode-full
     voting: false
 
@@ -7696,6 +7700,7 @@ projects:
       - gate-tempest-dsvm-neutron-src-oslo.versionedobjects
       - gate-tempest-dsvm-multinode-live-migration
       - gate-tempest-dsvm-nova-os-vif-nv
+      - gate-tempest-dsvm-nova-libvirt-kvm-apr
 
   - name: openstack/nova-docker
     template: