Update modulesync config

All modules confirm with this now except for
the puppet-tripleo module which has some
customizations that I didn't want to override. [1]

Since puppet-tripleo doesn't support ubuntu I didn't
push the nodepool-bionic beaker file to that repo either.

[1] http://paste.openstack.org/show/726199/

Change-Id: I5e51f683047dbbf7a5f1fc5e200f40e5110e499e
This commit is contained in:
Tobias Urdin 2018-07-18 16:22:01 +02:00
parent 4494cb8145
commit 3934dd54c2
6 changed files with 24 additions and 36 deletions

View File

@ -1,9 +1,4 @@
---
Gemfile:
required:
':development, :test, :system_tests':
- gem: 'puppet-openstack_spec_helper'
git: 'https://git.openstack.org/openstack/puppet-openstack_spec_helper'
Rakefile:
default_disabled_lint_checks:
- '80chars'

View File

@ -1,30 +1,17 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"
<% groups = {} -%>
<% (@configs['required'].keys + ((@configs['optional'] || {}).keys)).uniq.each do |key| -%>
<% groups[key] = (@configs['required'][key] || []) + ((@configs['optional'] || {})[key] || []) -%>
<% end -%>
<% -%>
<% groups.each do |group, gems| -%>
group <%= group %> do
<% maxlen = gems.map! do |gem| -%>
<% { -%>
<% 'gem' => gem['gem'], -%>
<% 'version' => gem['version'], -%>
<% 'require' => gem['require'], -%>
<% 'git' => gem['git'], -%>
<% 'branch' => gem['branch'], -%>
<% 'length' => gem['gem'].length + (("', '".length if gem['version']) || 0) + gem['version'].to_s.length -%>
<% } -%>
<% end.map do |gem| -%>
<% gem['length'] -%>
<% end.max -%>
<% gems.each do |gem| -%>
gem '<%= gem['gem'] %>'<%= ", '#{gem['version']}'" if gem['version'] %>, <%= ' ' * (maxlen - gem['length']) %><%= ":require => '#{gem['require'] || false}'" %><%= ", :git => '#{gem['git']}'" if gem['git'] %><%= ", :branch => '#{gem['branch']}'" if gem['branch'] %>
<% end -%>
group :development, :test, :system_tests do
if ENV['ZUUL_PROJECT'] == 'openstack/puppet-openstack_spec_helper'
gem 'puppet-openstack_spec_helper',
:path => '../..',
:require => 'false'
else
gem 'puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
:require => 'false'
end
end
<% end -%>
if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else

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

@ -0,0 +1,10 @@
HOSTS:
ubuntu-18.04-amd64:
roles:
- master
platform: ubuntu-18.04-amd64
hypervisor: none
ip: 127.0.0.1
CONFIG:
type: foss
set_env: false

View File

@ -1,6 +0,0 @@
# This is required for the docs build jobs
sphinx # BSD
openstackdocstheme # Apache-2.0
# This is required for the releasenotes build jobs
reno

View File

@ -7,5 +7,6 @@ envlist = releasenotes
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
[testenv:releasenotes]
deps = -rtest-requirements.txt
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html