From b5c1596894260773c61c352dc1517143cb14ecd3 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 12 Feb 2014 23:50:55 +0000 Subject: [PATCH] Switch to bare-centos6 single-use nodes All jobs which previously used centos6 nodes now use bare-centos6 nodes instead. Match the corresponding job names in Zuul's layout to apply the single-use parameter function to the nodes running them. Change-Id: I64eae79f1ddbd83b1d404383aa47fc812fbe94fc --- .../files/jenkins_job_builder/config/projects.yaml | 10 +++++----- .../jenkins_job_builder/config/python-bitrot-jobs.yaml | 2 +- .../files/jenkins_job_builder/config/python-jobs.yaml | 2 +- modules/openstack_project/files/zuul/layout.yaml | 8 ++++++++ 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 3ce4967f51..e73c7bd8bb 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -259,7 +259,7 @@ - python-jobs - gate-{name}-unittests-{env}: env: 26sa07 - node: centos6 + node: bare-centos6 - gate-{name}-unittests-{env}: env: 27sa07 - hook-{name}-rtfd @@ -1685,13 +1685,13 @@ # For anyone running without eventlet - gate-{name}-tox-{envlist}: envlist: py26-sa7-mysql - node: centos6 + node: bare-centos6 - gate-{name}-tox-{envlist}: envlist: py27-sa8-mysql # For anyone running the latest without eventlet - gate-{name}-tox-{envlist}: envlist: py26-sa9-mysql - node: centos6 + node: bare-centos6 - gate-{name}-tox-{envlist}: envlist: py27-sa9-mysql @@ -1749,10 +1749,10 @@ envlist: wsme-tip - gate-{name}-tox-{envlist}: envlist: ceilometer-stable - node: centos6 + node: bare-centos6 - gate-{name}-tox-{envlist}: envlist: ceilometer-tip - node: centos6 + node: bare-centos6 - gate-{name}-tox-{envlist}: envlist: ironic-tip diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml index 976fe817cf..a46a00cbc9 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml @@ -23,7 +23,7 @@ branches: - 'origin/{branch}' - node: centos6 + node: bare-centos6 - job-template: 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 5a8abfbaba..c5c65121e9 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 @@ -70,7 +70,7 @@ - test-results - console-log - node: centos6 + node: bare-centos6 - job-template: name: 'gate-{name}-python27' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 7ef962009c..b7e9e61916 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -203,6 +203,14 @@ jobs: parameter-function: set_log_url - name: ^.*(dsvm|devstack-vm).*$ parameter-function: single_use_node + - name: '^(gate|periodic)-.*-python26.*$' + parameter-function: single_use_node + - name: gate-sqlalchemy-migrate-unittests-26sa07 + parameter-function: single_use_node + - name: '^gate-taskflow-tox-py26-sa(7|9)-mysql$' + parameter-function: single_use_node + - name: '^gate-pecan-tox-ceilometer-(stable|tip)$' + parameter-function: single_use_node # begin section to deal with transition to bare-precise - name: gate-config-layout parameter-function: single_use_node