From deaa0361bce3fc2fd3ea264c382c2d525c5d17df Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 5 Apr 2013 14:08:10 +0200 Subject: [PATCH] Remove Folsom jobs for Ceilometer Change-Id: Ic0cd002dcd7378c4d04e4b3b264f1b4611d9a5f5 Signed-off-by: Julien Danjou Reviewed-on: https://review.openstack.org/26214 Reviewed-by: Jeremy Stanley Reviewed-by: Doug Hellmann Reviewed-by: James E. Blair Reviewed-by: Eoghan Glynn Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- .../jenkins_job_builder/config/macros.yaml | 10 --- .../jenkins_job_builder/config/projects.yaml | 1 - .../config/python-jobs.yaml | 65 ------------------- .../openstack_project/files/zuul/layout.yaml | 4 -- 4 files changed, 80 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml index 4162d4c955..76b9cf7f17 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -86,16 +86,6 @@ builders: - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27 {github-org} {project}" -- builder: - name: python26-folsom - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-folsom {github-org} {project}" - -- builder: - name: python27-folsom - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-folsom {github-org} {project}" - - builder: name: assert-no-extra-files builders: 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 47f756c1f2..f72db40040 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -45,7 +45,6 @@ jobs: - python-jobs - - python-jobs-folsom - openstack-publish-jobs - translation-jobs 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 18c2fe9fc3..65175b2876 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 @@ -149,33 +149,6 @@ node: rhel6 -- job-template: - name: 'gate-{name}-python26-folsom' - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python26-folsom: - 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 - - console-log - - # >= precise does not have python2.6 - node: oneiric - - - job-template: name: 'gate-{name}-python27' @@ -225,38 +198,6 @@ node: '{node}' -- job-template: - name: 'gate-{name}-python27-folsom' - - parameters: - - label: - name: NODE_LABEL - description: Label of node to use for this build - default: '{node}' - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python27-folsom: - 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 - - console-log - - node: '{node}' - - - job-template: name: 'gate-{name}-docs' @@ -369,9 +310,3 @@ - '{name}-branch-tarball' # pyflakes isn't standard # pylint isn't standard - -- job-group: - name: python-jobs-folsom - jobs: - - 'gate-{name}-python26-folsom' - - 'gate-{name}-python27-folsom' diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index eb30542ab3..24e3ed9a4d 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -977,16 +977,12 @@ projects: - gate-ceilometer-python26 - gate-ceilometer-python26-rhel6 - gate-ceilometer-python27 - - gate-ceilometer-python26-folsom - - gate-ceilometer-python27-folsom gate: - gate-ceilometer-requirements - gate-ceilometer-docs - gate-ceilometer-pep8 - gate-ceilometer-python26 - gate-ceilometer-python27 - - gate-ceilometer-python26-folsom - - gate-ceilometer-python27-folsom post: - ceilometer-branch-tarball - ceilometer-coverage