Merge "Temporarily pin pip<8 for ceilometer tarballs"

jenkins/jobs/python-jobs.yaml

@@ -350,6 +350,29 @@
       - 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

zuul/layout.yaml

@@ -4048,7 +4048,6 @@ 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
@@ -4079,6 +4078,11 @@ 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: