From 4d1670913146a2be45e0bb4e526d228a2d933b0d Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sat, 23 Jan 2016 03:21:50 +0000
Subject: [PATCH] Revert "Temporarily pin pip<8 for ceilometer tarballs"

We no longer need this temporary job, now that the ceilometer
2015.1.3 tag has a corresponding tarball generated.

This reverts commit e15bf9887946cde9fd899ebf934cd57eadb75663.

Change-Id: Ia96f0729e822baceb463a1e59f5197442e2de41f
---
 jenkins/jobs/python-jobs.yaml | 23 -----------------------
 zuul/layout.yaml              |  6 +-----
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/jenkins/jobs/python-jobs.yaml b/jenkins/jobs/python-jobs.yaml
index cc1a764d75..98e0007c74 100644
--- a/jenkins/jobs/python-jobs.yaml
+++ b/jenkins/jobs/python-jobs.yaml
@@ -350,29 +350,6 @@
       - console-log
       - zuul-swift-upload-console-log
 
-# Ceilometer 2015.1.3 was tagged while incompatible with pip 8
-# TODO(fungi): remove once tag has been retriggered and branch fix merged
-- job:
-    name: ceilometer-tarball-pin-pip
-    node: bare-trusty
-
-    builders:
-      - pin-pip
-      - revoke-sudo
-      - gerrit-git-prep
-      - tarball:
-          env: venv
-
-    publishers:
-      - tarball:
-          project: ceilometer
-          site: tarballs.openstack.org
-      - wheel:
-          project: ceilometer
-          site: tarballs.openstack.org
-      - console-log
-      - zuul-swift-upload-console-log
-
 - job-template:
     name: '{name}-tarball-constraints'
     node: bare-trusty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index da6c0f6e81..bea4f91a7e 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4030,6 +4030,7 @@ projects:
       - name: python-jobs
       - name: python3-jobs
       - name: openstack-server-publish-jobs
+      - name: openstack-server-release-jobs
       - name: periodic-kilo
       - name: periodic-liberty
       - name: check-requirements
@@ -4060,11 +4061,6 @@ projects:
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-ceilometer-es
       - gate-tempest-dsvm-ceilometer-es-full
-    pre-release:
-      - ceilometer-tarball-pin-pip
-    release:
-      - ceilometer-tarball-pin-pip
-      - ceilometer-merge-release-tags
 
   - name: openstack/ceilometer-powervm
     template: