From 2b13961beea9b640154fe66718b97ff28d2a5cda Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 20 Feb 2014 17:07:43 +0000 Subject: [PATCH] Temporarily switch PyPy jobs back to precisepy3k The previous change to switch to py3k-precise nodepool nodes overlooked that the old static precisepy3k slaves had on them cruft Python 2.7 installs of setuptools which worked with pypy. Switch back to them for now while we work on solving that issue. Change-Id: I6899035d0c422f622699f6729f573d16e4a9bc91 --- .../files/jenkins_job_builder/config/python-jobs.yaml | 2 +- modules/openstack_project/files/zuul/layout.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml index 9a0c8e0f27..78c9b0ff73 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-jobs.yaml @@ -136,7 +136,7 @@ - test-results - console-log - node: py3k-precise + node: precisepy3k - job-template: name: 'gate-{name}-docs' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index e6d0197dc5..b8593f424d 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -240,6 +240,9 @@ jobs: - name: ^(periodic|post)-mirror-python(26|27|33)$ parameter-function: reusable_node # the salt-trigger worker has no jobs yet + # jobs run on the precisepy3k workers + - name: ^gate-.*-pypy$ + parameter-function: reusable_node - name: ^(gate|check)-requirements-integration-dsvm$ branch: ^(?!stable/grizzly).*$ - name: ^(gate|check)-tempest-dsvm-neutron-pg$