From 07dfcc637686b9b25bf419ae5fa5b7aaed654997 Mon Sep 17 00:00:00 2001
From: Ramy Asselin <ramy.asselin@hpe.com>
Date: Thu, 29 Oct 2015 20:26:48 -0700
Subject: [PATCH] Remove gate-system-config-nodepool

Remove gate-system-config-nodepool and make gate-project-config-nodepool voting.
This completes the migration of nodepool.yaml from system-config to project-config.

Change-Id: Ibe4627bff813878d7a06756e325e283400b67290
Depends-On: I2b45a7145805368b1598d3a3e8a94f0e4eb8cf2d
---
 jenkins/jobs/infra.yaml | 13 -------------
 zuul/layout.yaml        | 11 +----------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/jenkins/jobs/infra.yaml b/jenkins/jobs/infra.yaml
index 648797ab43..7503bb9811 100644
--- a/jenkins/jobs/infra.yaml
+++ b/jenkins/jobs/infra.yaml
@@ -75,19 +75,6 @@
     publishers:
       - zuul-swift-upload-console-log
 
-- job:
-    name: gate-system-config-nodepool
-    node: 'bare-precise || bare-trusty'
-
-    builders:
-      - revoke-sudo
-      - gerrit-git-prep
-      - tox:
-          envlist: 'nodepool'
-
-    publishers:
-      - zuul-swift-upload-console-log
-
 - job:
     name: gate-project-config-nodepool
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2c11998b73..6a5c8db863 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1150,10 +1150,6 @@ jobs:
     failure-message: Jenkins XML output has changed.
     success-message: Jenkins XML output is unchanged.
 
-  # Making non-voting while bootstrapping in nodepool.yaml
-  - name: gate-system-config-nodepool
-    voting: false
-
   - name: gate-dsvm-nodepool
     voting: false
 
@@ -1192,9 +1188,7 @@ jobs:
       - '^nodepool/elements/.*$'
       - 'tox.ini'
 
-  # Making non-voting while bootstrapping in nodepool.yaml
   - name: gate-project-config-nodepool
-    voting: false
     files:
       - '^nodepool/nodepool.yaml'
       - 'tox.ini'
@@ -2618,8 +2612,7 @@ projects:
       - gate-project-config-layout
       - gate-project-config-pep8
       - gate-project-config-irc-access
-      #TODO(asselin) add back when it becomes voting
-      #- gate-project-config-nodepool
+      - gate-project-config-nodepool
       - gate-project-config-jenkins-project
       - gate-project-config-projects-yaml
       - gate-infra-docs-index
@@ -3357,8 +3350,6 @@ projects:
     check:
       - gate-system-config-pep8
       - gate-system-config-bashate
-      #TODO(asselin) remove this job after migration is complete
-      - gate-system-config-nodepool
       - gate-system-config-puppet-syntax
     gate:
       - gate-system-config-pep8