From 416df31309b39c23c9cee846f17a77b9937759bd Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 13 Mar 2013 21:06:51 +0000 Subject: [PATCH] Non-voting RHEL6 Python 2.6 unit test checks. * .../jenkins_job_builder/config/python-jobs.yaml: Add a template gate-{name}-python26-rhel6 job identical to gate-{name}-python26 but with a rhel6 node label. Also add it to the python-jobs group. * .../zuul/layout.yaml: Make gate-{name}-python26-rhel6 non-voting and go to extra lengths to avoid stable branches earlier than folsom for now. Add it to all projects calling gate-{name}-python26 directly. Change-Id: I8da8b27b5b7062e628665533df4e289fa2448ba8 Reviewed-on: https://review.openstack.org/24364 Reviewed-by: Anita Kuno Reviewed-by: Dan Prince Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- .../config/python-jobs.yaml | 45 +++++++++++++++++++ .../openstack_project/files/zuul/layout.yaml | 33 ++++++++++++++ 2 files changed, 78 insertions(+) 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 77fc276c54..86913d0e43 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 @@ -105,6 +105,50 @@ # >= precise does not have python2.6 node: oneiric +# temporary/non-voting while we burn in rhel6 slaves for havana +- job-template: + name: 'gate-{name}-python26-rhel6' + + wrappers: + - timeout: + timeout: 40 + fail: true + - timestamps + + triggers: + - zuul + + builders: + - gerrit-git-prep + - python26: + github-org: '{github-org}' + project: '{name}' + - assert-no-extra-files + + publishers: + - scp: + site: 'static.openstack.org' + files: + - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' + source: '**/*nose_results.html' + keep-hierarchy: false + copy-after-failure: true + - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' + source: '**/*testr_results.html.gz' + keep-hierarchy: false + copy-after-failure: true + - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' + source: '.testrepository/tmp*' + keep-hierarchy: false + copy-after-failure: true + - target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER' + source: '**/*subunit_log.txt.gz' + keep-hierarchy: false + copy-after-failure: true + - console-log + + node: rhel6 + - job-template: name: 'gate-{name}-python26-folsom' @@ -300,6 +344,7 @@ - '{name}-coverage' - 'gate-{name}-pep8' - 'gate-{name}-python26' + - 'gate-{name}-python26-rhel6' - 'gate-{name}-python27' - 'gate-{name}-docs' - '{name}-tarball' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index f252162321..74d74073e3 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -83,6 +83,9 @@ jobs: voting: false - name: ^.*-python27$ parameter-function: python27_params + - name: ^gate-.*-python26-rhel6$ + voting: false + branch: ^(?!stable/(diablo|essex)).*$ - name: gate-nova-pylint voting: false branch: ^(?!stable/(diablo|essex)).*$ @@ -122,6 +125,7 @@ projects: - gate-zuul-docs - gate-zuul-pyflakes - gate-zuul-python26 + - gate-zuul-python26-rhel6 - gate-zuul-python27 - dev-zuul-coverage gate: @@ -288,6 +292,7 @@ projects: - gate-cinder-pep8: - gate-cinder-docs - gate-cinder-python26 + - gate-cinder-python26-rhel6 - gate-cinder-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -319,6 +324,7 @@ projects: - gate-glance-pep8: - gate-glance-docs - gate-glance-python26 + - gate-glance-python26-rhel6 - gate-glance-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -350,6 +356,7 @@ projects: - gate-horizon-pep8: - gate-horizon-docs - gate-horizon-python26 + - gate-horizon-python26-rhel6 - gate-horizon-python27 - gate-horizon-selenium - gate-tempest-devstack-vm-smoke @@ -383,6 +390,7 @@ projects: - gate-keystone-pep8: - gate-keystone-docs - gate-keystone-python26 + - gate-keystone-python26-rhel6 - gate-keystone-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -416,6 +424,7 @@ projects: - gate-nova-pep8: - gate-nova-docs - gate-nova-python26 + - gate-nova-python26-rhel6 - gate-nova-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -450,6 +459,7 @@ projects: - gate-oslo-incubator-docs - gate-oslo-incubator-pyflakes - gate-oslo-incubator-python26 + - gate-oslo-incubator-python26-rhel6 - gate-oslo-incubator-python27 gate: - gate-oslo-incubator-docs @@ -468,6 +478,7 @@ projects: - gate-oslo.config-docs - gate-oslo.config-pep8 - gate-oslo.config-python26 + - gate-oslo.config-python26-rhel6 - gate-oslo.config-python27 gate: - gate-oslo.config-docs @@ -488,6 +499,7 @@ projects: - gate-quantum-pep8: - gate-quantum-docs - gate-quantum-python26 + - gate-quantum-python26-rhel6 - gate-quantum-python27 - gate-tempest-devstack-vm-quantum gate: @@ -512,6 +524,7 @@ projects: - gate-swift-pep8: - gate-swift-docs - gate-swift-python26 + - gate-swift-python26-rhel6 - gate-swift-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -543,6 +556,7 @@ projects: - gate-python-ceilometerclient-pep8: - gate-python-ceilometerclient-docs - gate-python-ceilometerclient-python26 + - gate-python-ceilometerclient-python26-rhel6 - gate-python-ceilometerclient-python27 gate: - gate-python-ceilometerclient-docs @@ -564,6 +578,7 @@ projects: - gate-python-cinderclient-pep8: - gate-python-cinderclient-docs - gate-python-cinderclient-python26 + - gate-python-cinderclient-python26-rhel6 - gate-python-cinderclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -595,6 +610,7 @@ projects: - gate-python-glanceclient-pep8: - gate-python-glanceclient-docs - gate-python-glanceclient-python26 + - gate-python-glanceclient-python26-rhel6 - gate-python-glanceclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -626,6 +642,7 @@ projects: - gate-python-keystoneclient-pep8: - gate-python-keystoneclient-docs - gate-python-keystoneclient-python26 + - gate-python-keystoneclient-python26-rhel6 - gate-python-keystoneclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -657,6 +674,7 @@ projects: - gate-python-novaclient-pep8: - gate-python-novaclient-docs - gate-python-novaclient-python26 + - gate-python-novaclient-python26-rhel6 - gate-python-novaclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -688,6 +706,7 @@ projects: - gate-python-openstackclient-pep8: - gate-python-openstackclient-docs - gate-python-openstackclient-python26 + - gate-python-openstackclient-python26-rhel6 - gate-python-openstackclient-python27 gate: - gate-python-openstackclient-docs @@ -709,6 +728,7 @@ projects: - gate-python-quantumclient-pep8: - gate-python-quantumclient-docs - gate-python-quantumclient-python26 + - gate-python-quantumclient-python26-rhel6 - gate-python-quantumclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -740,6 +760,7 @@ projects: - gate-python-swiftclient-pep8: - gate-python-swiftclient-docs - gate-python-swiftclient-python26 + - gate-python-swiftclient-python26-rhel6 - gate-python-swiftclient-python27 gate: - gate-python-swiftclient-docs @@ -840,6 +861,7 @@ projects: - gate-ceilometer-pep8: - gate-ceilometer-docs - gate-ceilometer-python26 + - gate-ceilometer-python26-rhel6 - gate-ceilometer-python27 - gate-ceilometer-python26-folsom - gate-ceilometer-python27-folsom @@ -896,6 +918,7 @@ projects: check: - gate-heat-pep8: - gate-heat-python26 + - gate-heat-python26-rhel6 - gate-heat-python27 - dev-heat-coverage gate: @@ -916,6 +939,7 @@ projects: check: - gate-python-heatclient-pep8: - gate-python-heatclient-python26 + - gate-python-heatclient-python26-rhel6 - gate-python-heatclient-python27 - dev-python-heatclient-coverage gate: @@ -936,6 +960,7 @@ projects: check: - gate-heat-cfntools-pep8: - gate-heat-cfntools-python26 + - gate-heat-cfntools-python26-rhel6 - gate-heat-cfntools-python27 - dev-heat-cfntools-coverage gate: @@ -956,6 +981,7 @@ projects: check: - gate-reddwarf-pep8: - gate-reddwarf-python26 + - gate-reddwarf-python26-rhel6 - gate-reddwarf-python27 gate: - gate-reddwarf-pep8 @@ -974,6 +1000,7 @@ projects: check: - gate-python-reddwarfclient-pep8: - gate-python-reddwarfclient-python26 + - gate-python-reddwarfclient-python26-rhel6 - gate-python-reddwarfclient-python27 gate: - gate-python-reddwarfclient-pep8 @@ -989,6 +1016,7 @@ projects: check: - gate-marconi-pep8: - gate-marconi-python26 + - gate-marconi-python26-rhel6 - gate-marconi-python27 gate: - gate-marconi-pep8 @@ -1000,6 +1028,7 @@ projects: - gate-moniker-pyflakes: - gate-moniker-pep8 - gate-moniker-python26 + - gate-moniker-python26-rhel6 - gate-moniker-python27 gate: - gate-moniker-pep8 @@ -1021,6 +1050,7 @@ projects: - gate-python-monikerclient-pyflakes: - gate-python-monikerclient-pep8 - gate-python-monikerclient-python26 + - gate-python-monikerclient-python26-rhel6 - gate-python-monikerclient-python27 gate: - gate-python-monikerclient-pep8 @@ -1041,6 +1071,7 @@ projects: check: - gate-bufunfa-pep8: - gate-bufunfa-python26 + - gate-bufunfa-python26-rhel6 - gate-bufunfa-python27 gate: - gate-bufunfa-pep8 @@ -1179,6 +1210,7 @@ projects: check: - gate-diskimage-builder-pep8: - gate-diskimage-builder-python26 + - gate-diskimage-builder-python26-rhel6 - gate-diskimage-builder-python27 gate: - gate-diskimage-builder-pep8 @@ -1209,6 +1241,7 @@ projects: check: - gate-packstack-pep8: - gate-packstack-python26 + - gate-packstack-python26-rhel6 - gate-packstack-python27 gate: - gate-packstack-pep8