From a401e353e8cdfe6880c224e100e704ac2d32bac9 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Thu, 8 Dec 2016 22:16:31 +0100
Subject: [PATCH] Switch to Xenial: Zuul

Remove periodic-test, it was added initially to show how periodic tests
work and is not needed anymore.

Remove the dev-coverage-job and instead run the normal coverage job in
the check queue, both jobs do the same. Since zuul has no
stable branches, run only the xenial job.

Change-Id: I77813eff5673f2acd41535d2a28679abcbc4b883
---
 jenkins/jobs/zuul.yaml | 35 -----------------------------------
 zuul/layout.yaml       |  9 +++------
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 jenkins/jobs/zuul.yaml

diff --git a/jenkins/jobs/zuul.yaml b/jenkins/jobs/zuul.yaml
deleted file mode 100644
index c503151219..0000000000
--- a/jenkins/jobs/zuul.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- job:
-    name: 'dev-zuul-coverage'
-    node: ubuntu-trusty
-
-    builders:
-      - gerrit-git-prep
-      - install-distro-packages
-      - revoke-sudo
-      - coverage:
-          env: cover
-
-    publishers:
-      - coverage-log
-      - console-log
-
-- job:
-    name: 'periodic-test'
-    node: ubuntu-trusty
-
-    wrappers:
-      - build-timeout:
-          timeout: 40
-      - timestamps
-
-    builders:
-      - gerrit-git-prep
-      - install-distro-packages
-      - revoke-sudo
-      - branch-git-prep:
-          branch: master
-      - python27
-
-    publishers:
-      - test-results
-      - console-log
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2caeceeb87..91a1a9cece 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2271,7 +2271,7 @@ jobs:
   - name: gate-grenade-dsvm-cinder-multinode-ubuntu-trusty
     branch: ^stable/mitaka.*$
 
-  - name: dev-zuul-coverage
+  - name: ^zuul-coverage.*$
     voting: false
 
   - name: ^gate-jenkins-job-builder-tox-docs-linkcheck-ubuntu-(trusty|xenial)$
@@ -5099,12 +5099,9 @@ projects:
       - name: python-jobs
       - name: infra-publish-jobs
     check:
-      - dev-zuul-coverage
-    post:
-      - zuul-coverage-ubuntu-trusty
       - zuul-coverage-ubuntu-xenial
-    periodic:
-      - periodic-test
+    post:
+      - zuul-coverage-ubuntu-xenial
 
   - name: openstack-infra/zuul-packaging
     template: