From 66959a7072b6812c19532c81898849b47a66cbb9 Mon Sep 17 00:00:00 2001 From: Marton Kiss Date: Thu, 18 Sep 2014 21:10:10 +0200 Subject: [PATCH] Pin openstackid jobs to precise Due the php5-mcrypt packaging bug we want to pin the openstackid related jenkins jobs to precise instead of trusty. Change-Id: Id1367edfda952f88777f36b6ddd3d5d2a2bfcf63 Related-Bug: 1369710 --- .../files/jenkins_job_builder/config/openstackid.yaml | 2 +- .../files/jenkins_job_builder/config/projects.yaml | 2 +- modules/openstack_project/files/zuul/layout.yaml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml index db162d6d74..4c44570b8b 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/openstackid.yaml @@ -1,6 +1,6 @@ - job: name: gate-openstackid-unittests - node: 'bare-precise || bare-trusty' + node: 'bare-precise' builders: - revoke-sudo 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 5673fd7262..602467d165 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -2930,7 +2930,7 @@ - project: name: openstackid - node: 'bare-precise || bare-trusty' + node: 'bare-precise' tarball-site: tarballs.openstack.org jobs: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 13118c9c35..7e211c9be2 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -477,6 +477,9 @@ jobs: # Berkshelf 3.x requires GeCode 3.x on precise. - name: ^gate-.*-chef-(lint|style|unit)$ parameter-function: set_node_options_default_precise + # openstackid doesn't work with php5-mcrypt on trusty + - name: ^.*openstackid-(unittests|release).*$ + parameter-function: set_node_options_default_precise # tempest and d-g branchless tests need to only run on master # (needs to be early to not impact non-voting stanzas later) - name: ^(?!periodic-).*(-icehouse|-havana)$