From 823410c6ea7f20368f15ebf537cbe0e7bfbf8ec4 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 3 Mar 2014 23:24:00 +0000 Subject: [PATCH] Run PyPy jobs on py3k-precise single-use slaves The issues which caused us to undo this originally seemed to be related to setuptools 2.1, and can no longer be reproduced with setuptools 2.2, so this seems to be safe now... manually tested PyPy unit test jobs for numerous projects on a held py3k-precise node with no problem. * .../jenkins_job_builder/config/python-jobs.yaml: Switch the node label for gate-{name}-pypy jobs from the old static slaves to the new single-use slaves managed by nodepool. * .../zuul/layout.yaml: Stop setting reusable_node for gate-.*-pypy jobs now that they use single-use nodes. Change-Id: I393d27f7c928454bfb7c165ff26f192183ef6a23 --- .../files/jenkins_job_builder/config/python-jobs.yaml | 2 +- modules/openstack_project/files/zuul/layout.yaml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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 78c9b0ff73..9a0c8e0f27 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: precisepy3k + node: py3k-precise - 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 0940553012..5cd23cc3af 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -296,9 +296,6 @@ 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$