From 8a3302472ebea2e1b78d33ebb86d787df2aef91d Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Mon, 14 Mar 2016 18:19:32 +0100
Subject: [PATCH] Start adding test for bifrost dhcp

Use the script that was created to test the dhcp settings
in bifrost, using static inventory. Initially add it as non-voting
job until we get successful results.

Change-Id: Ibaa2c298e8549c01a84eda16d187613925c85a4c
---
 jenkins/jobs/bifrost.yaml | 35 +++++++++++++++++++++++++++++++++++
 zuul/layout.yaml          |  3 ++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/jenkins/jobs/bifrost.yaml b/jenkins/jobs/bifrost.yaml
index 3cbfdd66a0..ecedd14bee 100644
--- a/jenkins/jobs/bifrost.yaml
+++ b/jenkins/jobs/bifrost.yaml
@@ -66,3 +66,38 @@
     publishers:
       - console-log
       - devstack-logs
+
+- job:
+    name: 'gate-bifrost-integration-dhcp-nv'
+    node: ubuntu-trusty
+
+    wrappers:
+      - build-timeout:
+          timeout: 120
+
+    builders:
+      - install-distro-packages
+      # Job only needs MySQL
+      - mysql-prep
+      - mysql-db:
+          db_name: openstack_citest
+      - link-logs
+      - net-info
+      - shell: |
+          #!/bin/bash -eux
+          cd $WORKSPACE
+
+          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
+            git://git.openstack.org \
+            openstack/bifrost \
+            openstack/diskimage-builder \
+            openstack/ironic \
+            openstack/python-ironicclient \
+            openstack-infra/shade
+          export GIT_BASE=$(pwd)
+          cd openstack/bifrost
+          scripts/test-bifrost-inventory-dhcp.sh
+
+    publishers:
+      - console-log
+      - devstack-logs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index ebcbd43418..930a551c10 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -989,7 +989,7 @@ jobs:
           - ^releasenotes/.*$
   # Skip non-doc jobs for doc-only bifrost changes. Since documents
   # are checked by bifrost-pep8, that job should not be skipped.
-  - name: ^.*bifrost-(python27|integration-coreosipa-cirros|integration-dibipa-debian-nv)$
+  - name: ^.*bifrost-(python27|integration-coreosipa-cirros|integration-dibipa-debian-nv|integration-dhcp-nv)$
     skip-if:
       - project: ^openstack/bifrost$
         all-files-match-any:
@@ -4210,6 +4210,7 @@ projects:
     check:
       - gate-bifrost-integration-coreosipa-cirros
       - gate-bifrost-integration-dibipa-debian-nv
+      - gate-bifrost-integration-dhcp-nv
     gate:
       - gate-bifrost-integration-coreosipa-cirros