From 948a291925c699affbf62ec2100f55e1a4dcf9c1 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Mon, 22 Aug 2016 15:51:32 +0200
Subject: [PATCH] Add a tempest job for python-ironic-inspector-client

We're migrating away from our old bash-based jobs to proper tempest ones.
This change adds a non-voting tempest job to python-ironic-inspector-client.
As the only potential point of failure is ironic - ironic-inspector interaction,
this job only runs a shorter smoke test instead of our full one.

Change-Id: I522fe18e063051acdf7b21af8dc453533838df7f
---
 jenkins/jobs/ironic.yaml   | 41 ++++++++++++++++++++++++++++++++++++++
 jenkins/jobs/projects.yaml |  5 +++++
 zuul/layout.yaml           |  4 ++++
 3 files changed, 50 insertions(+)

diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml
index 839869f3ca..3ba7e98c61 100644
--- a/jenkins/jobs/ironic.yaml
+++ b/jenkins/jobs/ironic.yaml
@@ -136,6 +136,14 @@
                  export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK=enroll"
             fi
 
+- builder:
+    name: ironic-inspector-client-from-source
+    builders:
+      - ironic-extra-vars:
+          script: |
+            export PROJECTS="openstack/python-ironic-inspector-client $PROJECTS"
+            export DEVSTACK_PROJECT_FROM_GIT="python-ironic-inspector-client,$DEVSTACK_PROJECT_FROM_GIT"
+
 - builder:
     name: ironic-postgres-enabled
     builders:
@@ -882,6 +890,39 @@
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-python-ironic-inspector-client{job-suffix}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 180
+      - timestamps
+
+    builders:
+      - print-template-name:
+          template-name: "{template-name}"
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - ironic-deploy-with-IPA:
+          ramdisk-type: 'tinyipa'
+      - ironic-tempest-regex:
+          tempest-regex: InspectorSmokeTest
+      - ironic-inspector-enabled:
+          inspector-auto-discovery: 0
+      - devstack-virtual-ironic:
+          build-ramdisk: ''
+          deploy_driver: agent_ssh
+          image-type: wholedisk
+          branch-override: '{branch-override}'
+          bm-vm-count: 1
+      - ironic-inspector-client-from-source
+
+    publishers:
+      - devstack-logs
+      - console-log
+
 - job-template:
     name: '{pipeline}-tempest-dsvm-ironic-inspector-discovery{job-suffix}'
     node: '{node}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 0689219ec7..27ce27df1b 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -10947,6 +10947,11 @@
           node: ubuntu-trusty
           job-suffix: ''
           branch-override: default
+      - '{pipeline}-tempest-dsvm-python-ironic-inspector-client{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: '-nv'
+          branch-override: default
 
 - project:
     name: python-ironicclient
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e1a16e102a..9447e8d1ee 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3059,6 +3059,9 @@ jobs:
   - name: ^gate-tempest-dsvm-ironic-inspector-discovery-nv$
     branch: ^(?!stable/liberty).*$
 
+  - name: ^gate-tempest-dsvm-python-ironic-inspector-client.*$
+    branch: ^(?!stable/(liberty|mitaka)).*$
+
   # NOTE(jlvilla): Ironic and Inspector Grenade do not work until after mitaka
   - name: ^gate-grenade-dsvm-ironic.*$
     branch: ^(?!stable/(liberty|mitaka)).*$
@@ -13605,6 +13608,7 @@ projects:
         - gate-python-ironic-inspector-client-tox-func-ubuntu-trusty
         - gate-python-ironic-inspector-client-tox-func-ubuntu-xenial
         - gate-python-ironic-inspector-client-dsvm
+        - gate-tempest-dsvm-python-ironic-inspector-client-nv
     gate:
         - gate-python-ironic-inspector-client-pep8-ubuntu-trusty
         - gate-python-ironic-inspector-client-python27-ubuntu-trusty