Align stars on stable/jewel CI

1) Use older puppetlabs-apache
The 2.2.0 release of puppetlabs apache broke the fastcgi support for el7
which this module used. This change updates the requirements and fixes
the CI to use at most 2.1.0 and switches to use the stable/pike
requirements which has puppetlabs-apache 2.0.0

2) Update bindep for puppet-tarball job.

3) Fix zuul configuration for complex branching.

Depends-On: Ie11af4944178fa057a189f4e0c7e4809dc694b86
Change-Id: I7038cd1267b68658d233f39a8fc7fc8bc423ad7b
This commit is contained in:
Alex Schultz 2017-11-08 08:20:06 -07:00 committed by Emilien Macchi
parent 718a5ffa0d
commit 0fa47cade7
4 changed files with 13 additions and 3 deletions

9
.zuul.yaml Normal file
View File

@ -0,0 +1,9 @@
---
- project:
name: openstack/puppet-ceph
templates:
- puppet-openstack-check-jobs
- puppet-openstack-module-unit-jobs
- puppet-openstack-integration-jobs-scenario001
- puppet-openstack-integration-jobs-scenario004

View File

@ -1,7 +1,7 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :test, :system_tests do
gem 'puppet-openstack_spec_helper', :require => 'false', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper'
gem 'puppet-openstack_spec_helper', :require => 'false', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper', :branch => 'stable/pike'
end
if facterversion = ENV['FACTER_GEM_VERSION']

View File

@ -1,5 +1,5 @@
# This is a cross-platform list tracking distribution packages needed by tests;
# see http://docs.openstack.org/infra/bindep/ for additional information.
# see https://docs.openstack.org/infra/bindep/ for additional information.
libxml2-devel [test platform:rpm]
libxml2-dev [test platform:dpkg]
@ -9,3 +9,4 @@ ruby-devel [test platform:rpm]
ruby-dev [test platform:dpkg]
zlib1g-dev [test platform:dpkg]
zlib-devel [test platform:rpm]
puppet [build]

View File

@ -53,7 +53,7 @@
},
{
"name": "puppetlabs/apache",
"version_requirement": ">=1.4.1 <2.0.0"
"version_requirement": ">=1.4.1 <2.2.0"
},
{
"name": "puppetlabs/concat",