diff --git a/modules/jenkins_jobs/files/templates/python_jobs.yml b/modules/jenkins_jobs/files/templates/python_jobs.yml index a43b4b3a7b..1cc1fd9486 100644 --- a/modules/jenkins_jobs/files/templates/python_jobs.yml +++ b/modules/jenkins_jobs/files/templates/python_jobs.yml @@ -116,6 +116,12 @@ logrotate: artifactDaysToKeep: -1 artifactNumToKeep: -1 +parameters: + - name: NODE_LABEL + description: Label of node to use for this build + type: label + default: '@NODE@' + triggers: - zuul diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index ce50f3e0c9..15e8dd769f 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -53,6 +53,8 @@ jobs: hold-following-changes: true - name: gate-tempest-devstack-vm parameter-function: devstack_params + - name: ^.*-python27$ + parameter-function: python27_params projects: diff --git a/modules/openstack_project/files/zuul/openstack_functions.py b/modules/openstack_project/files/zuul/openstack_functions.py index 6837ccac5b..6692026770 100644 --- a/modules/openstack_project/files/zuul/openstack_functions.py +++ b/modules/openstack_project/files/zuul/openstack_functions.py @@ -1,3 +1,7 @@ def devstack_params(change, params): if change.branch == 'stable/diablo': params['NODE_LABEL'] = 'devstack-oneiric' + +def python27_params(change, params): + if change.branch == 'stable/diablo': + params['NODE_LABEL'] = 'oneiric'