From 795cf8657e51f30bb2dff204395b26f358a41c2c Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 26 Apr 2013 15:44:00 +0000 Subject: [PATCH] Switching from RHEL to CentOS. * .../jenkins_job_builder/config/python-bitrot-jobs.yaml: Add centos6 bitrot variants of python26 bitrot jobs. * .../jenkins_job_builder/config/python-jobs.yaml: Switch the node label and name on python26 rhel6 jobs. * .../zuul/layout.yaml: Replace python26 rhel6 job variants with the new centos6 versions, but keep them non-voting still. Change-Id: I31125b6c4d137591cf98716dbc8950537ad4d45b Reviewed-on: https://review.openstack.org/27567 Reviewed-by: Dan Prince Reviewed-by: Clark Boylan Reviewed-by: matthew-wagoner Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- .../config/python-bitrot-jobs.yaml | 35 +++++++++ .../config/python-jobs.yaml | 8 +-- .../openstack_project/files/zuul/layout.yaml | 72 +++++++++---------- 3 files changed, 75 insertions(+), 40 deletions(-) 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 8bdc1dd769..1ab9643e0f 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 @@ -31,6 +31,39 @@ node: oneiric +# temporary while we burn in centos6 slaves for havana +- job-template: + name: 'periodic-{name}-python26-{branch-name}-centos6' + + triggers: + - timed: '0 6 * * *' + + builders: + - python26: + github-org: '{github-org}' + project: '{name}' + + publishers: + - scp: + site: 'static.openstack.org' + files: + - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' + source: '**/*nose_results.html' + keep-hierarchy: false + copy-after-failure: true + - console-log-periodic + - email: + recipients: '{email}' + + scm: + - git: + url: 'git://github.com/{github-org}/{name}.git' + branches: + - 'origin/{branch}' + + node: centos6 + + - job-template: name: 'periodic-{name}-python27-{branch-name}' @@ -120,6 +153,7 @@ node: quantal jobs: - 'periodic-{name}-python26-{branch-name}' + - 'periodic-{name}-python26-{branch-name}-centos6' - 'periodic-{name}-python27-{branch-name}' - 'periodic-{name}-docs-{branch-name}' @@ -132,5 +166,6 @@ node: quantal jobs: - 'periodic-{name}-python26-{branch-name}' + - 'periodic-{name}-python26-{branch-name}-centos6' - 'periodic-{name}-python27-{branch-name}' - 'periodic-{name}-docs-{branch-name}' 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 b58ab246c1..15f83d3815 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,9 +105,9 @@ # >= precise does not have python2.6 node: oneiric -# temporary/non-voting while we burn in rhel6 slaves for havana +# temporary/non-voting while we burn in centos6 slaves for havana - job-template: - name: 'gate-{name}-python26-rhel6' + name: 'gate-{name}-python26-centos6' wrappers: - timeout: @@ -147,7 +147,7 @@ copy-after-failure: true - console-log - node: rhel6 + node: centos6 - job-template: name: 'gate-{name}-python27' @@ -309,7 +309,7 @@ - '{name}-coverage' - 'gate-{name}-pep8' - 'gate-{name}-python26' - - 'gate-{name}-python26-rhel6' + - 'gate-{name}-python26-centos6' - 'gate-{name}-python27' - 'gate-{name}-docs' - 'gate-{name}-requirements' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 9c4c5ddbc5..adb4d525ef 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -85,7 +85,7 @@ jobs: voting: false - name: ^.*-python27$ parameter-function: python27_params - - name: ^gate-.*-python26-rhel6$ + - name: ^gate-.*-python26-centos6$ voting: false branch: ^(?!stable/(diablo|essex)).*$ - name: gate-nova-pylint @@ -133,7 +133,7 @@ projects: - gate-zuul-docs - gate-zuul-pyflakes - gate-zuul-python26 - - gate-zuul-python26-rhel6 + - gate-zuul-python26-centos6 - gate-zuul-python27 - dev-zuul-coverage gate: @@ -322,7 +322,7 @@ projects: - gate-cinder-pep8 - gate-cinder-docs - gate-cinder-python26 - - gate-cinder-python26-rhel6 + - gate-cinder-python26-centos6 - gate-cinder-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -358,7 +358,7 @@ projects: - gate-glance-pep8 - gate-glance-docs - gate-glance-python26 - - gate-glance-python26-rhel6 + - gate-glance-python26-centos6 - gate-glance-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -394,7 +394,7 @@ projects: - gate-horizon-pep8 - gate-horizon-docs - gate-horizon-python26 - - gate-horizon-python26-rhel6 + - gate-horizon-python26-centos6 - gate-horizon-python27 - gate-horizon-selenium - gate-tempest-devstack-vm-smoke @@ -432,7 +432,7 @@ projects: - gate-keystone-pep8 - gate-keystone-docs - gate-keystone-python26 - - gate-keystone-python26-rhel6 + - gate-keystone-python26-centos6 - gate-keystone-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -470,7 +470,7 @@ projects: - gate-nova-pep8 - gate-nova-docs - gate-nova-python26 - - gate-nova-python26-rhel6 + - gate-nova-python26-centos6 - gate-nova-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -509,7 +509,7 @@ projects: - gate-oslo-incubator-docs - gate-oslo-incubator-pyflakes - gate-oslo-incubator-python26 - - gate-oslo-incubator-python26-rhel6 + - gate-oslo-incubator-python26-centos6 - gate-oslo-incubator-python27 gate: - gate-oslo-incubator-requirements @@ -529,7 +529,7 @@ projects: - gate-oslo.config-pep8 - gate-oslo.config-docs - gate-oslo.config-python26 - - gate-oslo.config-python26-rhel6 + - gate-oslo.config-python26-centos6 - gate-oslo.config-python27 gate: - gate-oslo.config-requirements @@ -553,7 +553,7 @@ projects: - gate-quantum-pep8 - gate-quantum-docs - gate-quantum-python26 - - gate-quantum-python26-rhel6 + - gate-quantum-python26-centos6 - gate-quantum-python27 - gate-tempest-devstack-vm-quantum gate: @@ -580,7 +580,7 @@ projects: - gate-swift-pep8 - gate-swift-docs - gate-swift-python26 - - gate-swift-python26-rhel6 + - gate-swift-python26-centos6 - gate-swift-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -616,7 +616,7 @@ projects: - gate-python-ceilometerclient-pep8 - gate-python-ceilometerclient-docs - gate-python-ceilometerclient-python26 - - gate-python-ceilometerclient-python26-rhel6 + - gate-python-ceilometerclient-python26-centos6 - gate-python-ceilometerclient-python27 gate: - gate-python-ceilometerclient-requirements @@ -640,7 +640,7 @@ projects: - gate-python-cinderclient-pep8 - gate-python-cinderclient-docs - gate-python-cinderclient-python26 - - gate-python-cinderclient-python26-rhel6 + - gate-python-cinderclient-python26-centos6 - gate-python-cinderclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -676,7 +676,7 @@ projects: - gate-python-glanceclient-pep8 - gate-python-glanceclient-docs - gate-python-glanceclient-python26 - - gate-python-glanceclient-python26-rhel6 + - gate-python-glanceclient-python26-centos6 - gate-python-glanceclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -712,7 +712,7 @@ projects: - gate-python-keystoneclient-pep8 - gate-python-keystoneclient-docs - gate-python-keystoneclient-python26 - - gate-python-keystoneclient-python26-rhel6 + - gate-python-keystoneclient-python26-centos6 - gate-python-keystoneclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -748,7 +748,7 @@ projects: - gate-python-novaclient-pep8 - gate-python-novaclient-docs - gate-python-novaclient-python26 - - gate-python-novaclient-python26-rhel6 + - gate-python-novaclient-python26-centos6 - gate-python-novaclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -784,7 +784,7 @@ projects: - gate-python-openstackclient-pep8 - gate-python-openstackclient-docs - gate-python-openstackclient-python26 - - gate-python-openstackclient-python26-rhel6 + - gate-python-openstackclient-python26-centos6 - gate-python-openstackclient-python27 gate: - gate-python-openstackclient-requirements @@ -808,7 +808,7 @@ projects: - gate-python-quantumclient-pep8 - gate-python-quantumclient-docs - gate-python-quantumclient-python26 - - gate-python-quantumclient-python26-rhel6 + - gate-python-quantumclient-python26-centos6 - gate-python-quantumclient-python27 - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full @@ -844,7 +844,7 @@ projects: - gate-python-swiftclient-pep8 - gate-python-swiftclient-docs - gate-python-swiftclient-python26 - - gate-python-swiftclient-python26-rhel6 + - gate-python-swiftclient-python26-centos6 - gate-python-swiftclient-python27 gate: - gate-python-swiftclient-requirements @@ -1000,7 +1000,7 @@ projects: - gate-ceilometer-pep8 - gate-ceilometer-docs - gate-ceilometer-python26 - - gate-ceilometer-python26-rhel6 + - gate-ceilometer-python26-centos6 - gate-ceilometer-python27 gate: - gate-ceilometer-requirements @@ -1061,7 +1061,7 @@ projects: - gate-heat-requirements - gate-heat-pep8 - gate-heat-python26 - - gate-heat-python26-rhel6 + - gate-heat-python26-centos6 - gate-heat-python27 - dev-heat-coverage gate: @@ -1084,7 +1084,7 @@ projects: - gate-python-heatclient-requirements - gate-python-heatclient-pep8 - gate-python-heatclient-python26 - - gate-python-heatclient-python26-rhel6 + - gate-python-heatclient-python26-centos6 - gate-python-heatclient-python27 - dev-python-heatclient-coverage gate: @@ -1107,7 +1107,7 @@ projects: - gate-heat-cfntools-requirements - gate-heat-cfntools-pep8 - gate-heat-cfntools-python26 - - gate-heat-cfntools-python26-rhel6 + - gate-heat-cfntools-python26-centos6 - gate-heat-cfntools-python27 - dev-heat-cfntools-coverage gate: @@ -1135,7 +1135,7 @@ projects: check: - gate-reddwarf-pep8 - gate-reddwarf-python26 - - gate-reddwarf-python26-rhel6 + - gate-reddwarf-python26-centos6 - gate-reddwarf-python27 gate: - gate-reddwarf-pep8 @@ -1154,7 +1154,7 @@ projects: check: - gate-python-reddwarfclient-pep8 - gate-python-reddwarfclient-python26 - - gate-python-reddwarfclient-python26-rhel6 + - gate-python-reddwarfclient-python26-centos6 - gate-python-reddwarfclient-python27 gate: - gate-python-reddwarfclient-pep8 @@ -1170,7 +1170,7 @@ projects: check: - gate-marconi-pep8 - gate-marconi-python26 - - gate-marconi-python26-rhel6 + - gate-marconi-python26-centos6 - gate-marconi-python27 gate: - gate-marconi-pep8 @@ -1182,7 +1182,7 @@ projects: - gate-moniker-pyflakes - gate-moniker-pep8 - gate-moniker-python26 - - gate-moniker-python26-rhel6 + - gate-moniker-python26-centos6 - gate-moniker-python27 gate: - gate-moniker-pep8 @@ -1204,7 +1204,7 @@ projects: - gate-python-monikerclient-pyflakes - gate-python-monikerclient-pep8 - gate-python-monikerclient-python26 - - gate-python-monikerclient-python26-rhel6 + - gate-python-monikerclient-python26-centos6 - gate-python-monikerclient-python27 gate: - gate-python-monikerclient-pep8 @@ -1225,7 +1225,7 @@ projects: check: - gate-bufunfa-pep8 - gate-bufunfa-python26 - - gate-bufunfa-python26-rhel6 + - gate-bufunfa-python26-centos6 - gate-bufunfa-python27 gate: - gate-bufunfa-pep8 @@ -1377,7 +1377,7 @@ projects: check: - gate-diskimage-builder-pep8 - gate-diskimage-builder-python26 - - gate-diskimage-builder-python26-rhel6 + - gate-diskimage-builder-python26-centos6 - gate-diskimage-builder-python27 gate: - gate-diskimage-builder-pep8 @@ -1390,7 +1390,7 @@ projects: check: - gate-os-config-applier-pep8 - gate-os-config-applier-python26 - - gate-os-config-applier-python26-rhel6 + - gate-os-config-applier-python26-centos6 - gate-os-config-applier-python27 gate: - gate-os-config-applier-pep8 @@ -1403,7 +1403,7 @@ projects: check: - gate-os-refresh-config-pep8 - gate-os-refresh-config-python26 - - gate-os-refresh-config-python26-rhel6 + - gate-os-refresh-config-python26-centos6 - gate-os-refresh-config-python27 gate: - gate-os-refresh-config-pep8 @@ -1416,7 +1416,7 @@ projects: check: - gate-tripleo-image-elements-pep8 - gate-tripleo-image-elements-python26 - - gate-tripleo-image-elements-python26-rhel6 + - gate-tripleo-image-elements-python26-centos6 - gate-tripleo-image-elements-python27 gate: - gate-tripleo-image-elements-pep8 @@ -1490,7 +1490,7 @@ projects: check: - gate-packstack-pep8 - gate-packstack-python26 - - gate-packstack-python26-rhel6 + - gate-packstack-python26-centos6 - gate-packstack-python27 gate: - gate-packstack-pep8 @@ -1507,7 +1507,7 @@ projects: check: - gate-savanna-pep8 - gate-savanna-python26 - - gate-savanna-python26-rhel6 + - gate-savanna-python26-centos6 - gate-savanna-python27 gate: - gate-savanna-pep8 @@ -1528,7 +1528,7 @@ projects: check: - gate-python-savannaclient-pep8 - gate-python-savannaclient-python26 - - gate-python-savannaclient-python26-rhel6 + - gate-python-savannaclient-python26-centos6 - gate-python-savannaclient-python27 gate: - gate-python-savannaclient-pep8