From cda4afb2b3ceba93ea64a8568a37dd60c0aedf40 Mon Sep 17 00:00:00 2001
From: Kaitlin Farr <kaitlin.farr@jhuapl.edu>
Date: Mon, 16 Jan 2017 11:32:45 -0500
Subject: [PATCH] Add job template for Barbican tempest plugin

Adds a job for barbican-tempest-plugin that will run DevStack,
enable the Barbican Tempest plugin, and run just the Barbican
tempest plugin tests

Change-Id: I87b5f45b9658df5eb7578a64d5ac360e404859f8
---
 jenkins/jobs/barbican.yaml | 42 ++++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml | 10 +++++++--
 zuul/layout.yaml           |  2 ++
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/jenkins/jobs/barbican.yaml b/jenkins/jobs/barbican.yaml
index cb9b015e44..76a765338c 100644
--- a/jenkins/jobs/barbican.yaml
+++ b/jenkins/jobs/barbican.yaml
@@ -80,3 +80,45 @@
     publishers:
       - devstack-logs
       - console-log
+
+- job-template:
+    name: '{pipeline}-barbican-{plugin}-dsvm-tempest{special}-{node}{suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 70
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - shell: |
+          #!/bin/bash -xe
+          export PYTHONUNBUFFERED=true
+          export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
+          export DEVSTACK_GATE_TEMPEST_REGEX=barbican
+
+          export BRANCH_OVERRIDE={branch-override}
+          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
+              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
+          fi
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
+          export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
+          export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican git://git.openstack.org/openstack/barbican"
+
+          if [ "{special}" == "-postgres" ] ; then
+              export DEVSTACK_GATE_POSTGRES=1
+          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
+
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 5efbb315c6..0bf11525cf 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -396,8 +396,14 @@
 
     jobs:
       - gate-{name}-pep8-{node}:
-          node:
-            - ubuntu-xenial
+          node: ubuntu-xenial
+      - '{pipeline}-barbican-{plugin}-dsvm-tempest{special}-{node}{suffix}':
+          pipeline: gate
+          plugin: simple-crypto
+          branch-override: default
+          special: ''
+          suffix: ''
+          node: ubuntu-xenial
 
 - project:
     name: bareon
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index dff9933457..8c81bf5177 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5582,6 +5582,8 @@ projects:
         - gate-barbican-tempest-plugin-pep8-ubuntu-xenial
     gate:
         - gate-barbican-tempest-plugin-pep8-ubuntu-xenial
+    experimental:
+      - gate-barbican-simple-crypto-dsvm-tempest-ubuntu-xenial
 
   - name: openstack/bareon
     template: