From 7a66365b1472a5071db3169476b5ab8030b662cc Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sun, 16 Feb 2014 02:28:48 +0000 Subject: [PATCH] Use py3k-precise nodes Switch to running python33 and pypy unit tests on py3k-precise nodes once Ic03b9532ec0ad8b6abe8171855e6c33f7dcffef2 merges and the additional images/nodes are ready for action. Change-Id: I98ad3a1171034cda1236dbb6dbfaddc2e26934cf --- .../files/jenkins_job_builder/config/python-jobs.yaml | 4 ++-- modules/openstack_project/files/zuul/layout.yaml | 3 --- 2 files changed, 2 insertions(+), 5 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 95de7a8856..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 @@ -114,7 +114,7 @@ - test-results - console-log - node: precisepy3k + node: py3k-precise - job-template: name: 'gate-{name}-pypy' @@ -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 9f101acad2..98fc310f9d 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -233,9 +233,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-.*-(python33|pypy)$ - parameter-function: reusable_node - name: ^(gate|check)-requirements-integration-dsvm$ branch: ^(?!stable/grizzly).*$ - name: ^(gate|check)-tempest-dsvm-neutron-pg$