From 5af444ae45df0477cdd0ec5a71022d26a5cc1ac0 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 10 Mar 2016 15:25:14 +1100
Subject: [PATCH] Add centos-minimal build, experimental job

Add a build of centos-minimal to nodepool.  Let's just add this to
Rackspace first, because that's the "hard" place to get working
(configdrive, no dhcp, etc).  FWIW I have tested this image with my
RAX account.

The plan is to replace devstack-centos7 with this image globally once
we've got it stable.

Add an experimental job to use this new node for testing (devstack
should be able to bootstrap itself on these types of nodes).

Change-Id: I02fd98f5df7f90aa5d50666166b5c736f6f06aaf
Depends-On: I2956aaa49ba3137a799f97e0983ab4b7c93a0a0c
---
 jenkins/jobs/projects.yaml |  8 ++++++++
 nodepool/nodepool.yaml     | 41 ++++++++++++++++++++++++++++++++++++++
 zuul/layout.yaml           |  1 +
 3 files changed, 50 insertions(+)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 23dcc2f833..5ca8b16a84 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1303,7 +1303,15 @@
           node: devstack-centos7
           neutron: 1
           job-suffix: ''
+      # Experimental job for testing centos-minimal nodes
+      - '{pipeline}-tempest-dsvm-platform-{name}{job-suffix}':
+          pipeline: gate
+          name: centos7-minimal
+          node: centos-7
+          neutron: 1
+          job-suffix: ''
 
+          
 - project:
     name: devstack-plugin-amqp1
     node: bare-trusty
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index d0fdcd3857..3c53278875 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -97,6 +97,14 @@ labels:
       - name: internap-nyj01
       - name: vexxhost-ca-ymq-1
       - name: osic-cloud1
+  - name: centos-7
+    image: centos-7
+    ready-script: configure_mirror.sh
+    min-ready: 1
+    providers:
+      - name: rax-dfw
+      - name: rax-ord
+      - name: rax-iad
   - name: fedora-23
     image: fedora-23
     ready-script: configure_mirror.sh
@@ -163,6 +171,12 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: centos-7
+        min-ram: 8192
+        diskimage: centos-7
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -216,6 +230,12 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: centos-7
+        min-ram: 8192
+        diskimage: centos-7
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -269,6 +289,12 @@ providers:
         username: jenkins
         private-key: /home/nodepool/.ssh/id_rsa
         config-drive: true
+      - name: centos-7
+        min-ram: 8192
+        diskimage: centos-7
+        username: jenkins
+        private-key: /home/nodepool/.ssh/id_rsa
+        config-drive: true
       - name: devstack-centos7
         base-image: 'CentOS 7 (PVHVM)'
         min-ram: 8192
@@ -565,6 +591,21 @@ diskimages:
       TMPDIR: /opt/dib_tmp
       DIB_IMAGE_CACHE: /opt/dib_cache
       QEMU_IMG_OPTIONS: compat=0.10
+  - name: centos-7
+    elements:
+      - centos-minimal
+      - vm
+      - simple-init
+      - openstack-repos
+      - nodepool-base
+      - node-devstack
+      - puppet
+      - cache-bindep
+      - growroot
+    env-vars:
+      TMPDIR: /opt/dib_tmp
+      DIB_IMAGE_CACHE: /opt/dib_cache
+      QEMU_IMG_OPTIONS: compat=0.10
   - name: fedora-23
     elements:
       - fedora-minimal
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 366ad6233e..8930fa7336 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2452,6 +2452,7 @@ projects:
       - gate-dsvm-mongodb-zaqar
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-platform-centos7-neutron
+      - gate-tempest-dsvm-platform-centos7-minimal
       - gate-tempest-dsvm-full-ceph
     periodic:
       - propose-devstack-plugins-list