Add non-voting Sahara grenade job for upgrades testing

Change-Id: I743b36a12e1b6dd3006772a46e4bb820c4a40e29

jenkins/jobs/devstack-gate.yaml

@@ -2210,3 +2210,4 @@
       - '{pipeline}-tempest-dsvm-nova-wsgi-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-trove{branch-designator}'
       - '{pipeline}-grenade-dsvm-trove{branch-designator}'
+      - '{pipeline}-grenade-dsvm-sahara{branch-designator}'

jenkins/jobs/sahara.yaml

@@ -149,3 +149,38 @@
     publishers:
       - devstack-logs
       - console-log
+
+
+- job-template:
+    name: '{pipeline}-grenade-dsvm-sahara{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 130
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export OVERRIDE_ENABLED_SERVICES=c-api,c-bak,c-sch,c-vol,cinder,dstat,g-api,g-reg,h-api,h-api-cfn,h-api-cw,h-eng,heat,key,mysql,n-api,n-cond,n-cpu,n-crt,n-obj,n-sch,q-agt,q-dhcp,q-l3,q-meta,q-metering,q-svc,q-vpn,quantum,rabbit,s-account,s-container,s-object,s-proxy,q-lbaas,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,sahara
+          export DEVSTACK_GATE_TIMEOUT=120
+          export DEVSTACK_GATE_NEUTRON=1
+          export DEVSTACK_GATE_TEMPEST=0
+          export DEVSTACK_GATE_GRENADE=pullup
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export GRENADE_PLUGINRC="enable_grenade_plugin sahara https://git.openstack.org/openstack/sahara"
+
+          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

zuul/layout.yaml

@@ -987,6 +987,10 @@ jobs:
   - name: gate-sahara-python34
     branch: ^(?!stable/(juno|kilo)).*$
 
+  - name: gate-grenade-dsvm-sahara
+    branch: ^(?!stable/(icehouse|juno|kilo)).*$
+    voting: false
+
   - name: gate-kite-python34
     voting: false
 
@@ -2416,6 +2420,7 @@ projects:
       - check-tempest-dsvm-sahara
       - sahara-coverage
       - gate-sahara-tox-bandit
+      - gate-grenade-dsvm-sahara
     gate:
       - gate-tempest-dsvm-sahara
       - gate-sahara-tox-py27-scenario-unit