diff --git a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml b/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml deleted file mode 100644 index 2179711ff0..0000000000 --- a/modules/openstack_project/files/jenkins_job_builder/config/ceilometer.yaml +++ /dev/null @@ -1,31 +0,0 @@ -- job: - name: 'gate-ceilometer-python26-essex' - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python26-essex - - publishers: - - console-log - - # >= precise does not have python2.6 - node: oneiric - - -- job: - name: 'gate-ceilometer-python27-essex' - - triggers: - - zuul - - builders: - - gerrit-git-prep - - python27-essex - - publishers: - - console-log - - node: oneiric 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 92c6a57ad3..ca47335ab3 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml @@ -88,16 +88,6 @@ builders: - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27" -- builder: - name: python26-essex - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 26-essex" - -- builder: - name: python27-essex - builders: - - shell: "/usr/local/jenkins/slave_scripts/run-tox.sh 27-essex" - - builder: name: tarball builders: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 5aff9cc3c2..54d4cc7f87 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -609,8 +609,6 @@ projects: - gate-ceilometer-pep8 - gate-ceilometer-python26 - gate-ceilometer-python27 - - gate-ceilometer-python26-essex - - gate-ceilometer-python27-essex gate: - gate-ceilometer-merge: - gate-ceilometer-pep8