From 4cb79fbaf35276e214b3512d74eb3b5704ea77cd Mon Sep 17 00:00:00 2001
From: Brianna Poulos <Brianna.Poulos@jhuapl.edu>
Date: Fri, 24 Feb 2017 16:39:42 -0500
Subject: [PATCH] Add barbican-tempest-plugin tests to Castellan

Castellan is used by various projects (nova, glance, cinder, etc.)
for different security features (including image signing, cinder
volume encryption, and ephemeral storage encryption).  As scenario
tests are being added to the barbican-tempest-plugin for these
features, it would be valuable to confirm that changes to castellan
to not break these features.

This change adds an experimental gate check to castellan for
the barbican-tempest-plugin, including setting the variable
LIBS_FROM_GIT=castellan to cause the current patchset of castellan
to be used instead of the latest version from pypi.

Change-Id: Ic5b3e86e8f58916bd645a8a7f0d701e8757830ed
---
 jenkins/jobs/barbican.yaml | 4 ++++
 jenkins/jobs/projects.yaml | 7 +++++++
 zuul/layout.yaml           | 2 ++
 3 files changed, 13 insertions(+)

diff --git a/jenkins/jobs/barbican.yaml b/jenkins/jobs/barbican.yaml
index 3db8fa9e62..fc4dab80e5 100644
--- a/jenkins/jobs/barbican.yaml
+++ b/jenkins/jobs/barbican.yaml
@@ -122,6 +122,10 @@
               export DEVSTACK_GATE_POSTGRES=1
           fi
 
+          if [ "{special}" == "-castellan-from-git" ] ; then
+              export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=castellan"
+          fi
+
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
 
           ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 231111878f..d38a77c21e 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -550,6 +550,13 @@
       - python-jobs
       - openstack-client-publish-jobs
       - pypi-jobs
+      - '{pipeline}-barbican-{plugin}-dsvm-tempest{special}-{node}{suffix}':
+          pipeline: gate
+          plugin: simple-crypto
+          branch-override: default
+          special: '-castellan-from-git'
+          suffix: '-nv'
+          node: ubuntu-xenial
 
 - project:
     name: cathead
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 23b3ebf007..45786314c3 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5916,6 +5916,8 @@ projects:
       - gate-castellan-dsvm-functional
     gate:
       - gate-castellan-dsvm-functional
+    experimental:
+      - gate-barbican-simple-crypto-dsvm-tempest-castellan-from-git-ubuntu-xenial-nv
 
   - name: openstack/cathead
     template: