From 823afdb70c8441bd82e849c4176550e3c4cc7ca5 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Thu, 6 Nov 2014 10:17:22 +0100
Subject: [PATCH] Drop newlibvirt job

This job isn't working and I've since switched gears towards working
on a CentOS based solution.

Change-Id: Ied67757343cbdc29167b9f469137a27bc5d8b8e4
---
 jenkins/jobs/devstack-gate.yaml | 31 -------------------------------
 jenkins/jobs/projects.yaml      |  5 -----
 zuul/layout.yaml                |  1 -
 zuul/openstack_functions.py     |  2 --
 4 files changed, 39 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index bb2ae8abda..fe2fcebec9 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -251,36 +251,6 @@
       - devstack-logs
       - console-log
 
-- job-template:
-    name: '{pipeline}-tempest-dsvm-full-newlibvirt{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
 - job-template:
     name: '{pipeline}-tempest-master-dsvm-full{branch-designator}'
     node: '{node}'
@@ -1704,4 +1674,3 @@
       - '{pipeline}-tempest-dsvm-keystonev3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-neutron-keystonev3-full{branch-designator}'
       - '{pipeline}-tempest-dsvm-full-ceph{branch-designator}'
-      - '{pipeline}-tempest-dsvm-full-newlibvirt{branch-designator}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 4ebdccb825..a74ff09965 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -363,11 +363,6 @@
       - gate-{name}-pylint
       - gate-{name}-pip-missing-reqs
       - translation-jobs
-      - '{pipeline}-tempest-dsvm-full-newlibvirt{branch-designator}':
-          pipeline: experimental
-          node: 'devstack-f20-virt-preview'
-          branch-designator: ''
-          branch-override: default
 
 - project:
     name: nova-specs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index c919f0d70f..cd16f89dfd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1373,7 +1373,6 @@ projects:
       - check-tempest-dsvm-cells-full
       - check-tempest-dsvm-neutron-pg
       - gate-nova-pip-missing-reqs
-      - check-tempest-dsvm-full-newlibvirt
     silent:
       - check-tempest-dsvm-docker
     pre-release:
diff --git a/zuul/openstack_functions.py b/zuul/openstack_functions.py
index 1b7931a391..84a1db0fd7 100644
--- a/zuul/openstack_functions.py
+++ b/zuul/openstack_functions.py
@@ -56,8 +56,6 @@ def devstack_params(item, job, params):
         params['ZUUL_NODE'] = 'devstack-centos7'
     elif 'aiopcpu' in job.name:
         params['ZUUL_NODE'] = 'devstack-trusty-2-node'
-    elif 'newlibvirt' in job.name:
-        params['ZUUL_NODE'] = 'devstack-f20-virt-preview'
     else:
         params['ZUUL_NODE'] = 'devstack-trusty'