Skip to content
Snippets Groups Projects
Commit ca7b7bca authored by Christophe Haen's avatar Christophe Haen
Browse files

Merge branch 'modulesync' into 'qa' 

[Rundeck] Update from it-puppet-modulesync-configs 1.4.2

See merge request ai/it-puppet-module-dirac!27
parents c78fa4dc 62c58956
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 2
− 1
View file @ ca7b7bca
# maintained by modulesync
code/pkg/
code/rspec.xml
code/Gemfile.lock
code/vendor/
code/spec/fixtures/manifests/
code/spec/fixtures/modules/
code/.vagrant/
code/.yardoc/
code/.bundle/
code/coverage/
code/log/
code/.idea/
code/*.iml
code/.*.sw
ci/.bundle
ci/Gemfile.lock
ci/vendor
.__afs*
......
.gitlab-ci.yml
+ 25
− 10
View file @ ca7b7bca
......@@ -24,7 +24,7 @@ cc7-puppet-ci:
CONTEXT_DIR: .
DOCKER_FILE: ci/Dockerfile
FROM: gitlab-registry.cern.ch/linuxsupport/cc7-base
TO: ${CI_REGISTRY_IMAGE}:cc7-puppet-ci-1.3.0
TO: ${CI_REGISTRY_IMAGE}:cc7-puppet-ci-1.5.0
before_script:
......@@ -36,33 +36,48 @@ puppet5:
stage: tests
tags:
- docker
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.3.0
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.5.0
variables:
SPEC_OPTS: "--format progress --format RspecJunitFormatter --out rspec.xml"
artifacts:
reports:
junit: code/rspec.xml
script:
- cd code
- rm -f ../ci/Gemfile.lock
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.5.8' scl enable rh-ruby24 'bundle install --local --without system_tests development'
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.5.8' scl enable rh-ruby24 'bundle install --local'
- LANG=en_US.UTF-8 BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.5.8' scl enable rh-ruby24 'bundle exec rake --rakefile ../ci/Rakefile test'
puppet5_latest:
stage: tests
tags:
- docker
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.3.0
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.5.0
variables:
SPEC_OPTS: "--format progress --format RspecJunitFormatter --out rspec.xml"
artifacts:
reports:
junit: code/rspec.xml
script:
- cd code
- rm -f ../ci/Gemfile.lock
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.0' scl enable rh-ruby24 'bundle install --local --without system_tests development'
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.0' scl enable rh-ruby24 'bundle install --local'
- LANG=en_US.UTF-8 BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.0' scl enable rh-ruby24 'bundle exec rake --rakefile ../ci/Rakefile test'
puppet6_latest:
stage: tests
tags:
- docker
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.3.0
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.5.0
variables:
SPEC_OPTS: "--format progress --format RspecJunitFormatter --out rspec.xml"
artifacts:
reports:
junit: code/rspec.xml
script:
- cd code
- rm -f ../ci/Gemfile.lock
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 6.0' scl enable rh-ruby25 'bundle install --local --without system_tests development'
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 6.0' scl enable rh-ruby25 'bundle install --local'
- LANG=en_US.UTF-8 BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 6.0' scl enable rh-ruby25 'bundle exec rake --rakefile ../ci/Rakefile test'
allow_failure: true
......@@ -71,12 +86,12 @@ rubocop:
stage: tests
tags:
- docker
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.3.0
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.5.0
script:
- cd code
- rm -f ../ci/Gemfile.lock
- /usr/bin/test -f .rubocop.yml || cp -p ../ci/boilerplate/.rubocop.yml .rubocop.yml
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.0' scl enable rh-ruby24 'bundle install --local --without system_tests development'
- BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.0' scl enable rh-ruby24 'bundle install --local'
- LANG=en_US.UTF-8 BUNDLE_GEMFILE=../ci/Gemfile PUPPET_VERSION='~> 5.0' scl enable rh-ruby24 'bundle exec rake --rakefile ../ci/Rakefile rubocop'
allow_failure: true
......@@ -84,7 +99,7 @@ yaml-validate:
stage: tests
tags:
- docker
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.3.0
image: gitlab-registry.cern.ch/ai/it-puppet-module-ci_images:cc7-puppet-ci-1.5.0
script:
- if [ -d data ] && [ -d code/data ] ; then echo "Directory data and code/data cannot both exist." ; /bin/false ; else true; fi
- if [ -d data ] ; then yaml-lint data ; else true; fi
......
.msync.yml
+ 1
− 1
View file @ ca7b7bca
modulesync_config_version: '1.3.0'
modulesync_config_version: '1.5.0'
README.md
+ 5
− 4
View file @ ca7b7bca
......@@ -10,15 +10,15 @@
<td><strong>Build status</strong></td>
<td>
<a href='https://gitlab.cern.ch/ai/it-puppet-module-dirac/commits/master'>
<img src='https://gitlab.cern.ch/ai/it-puppet-module-dirac/badges/master/build.svg'></a>
<img src='https://gitlab.cern.ch/ai/it-puppet-module-dirac/badges/master/pipeline.svg'></a>
</td>
<td>
<a href='https://gitlab.cern.ch/ai/it-puppet-module-dirac/commits/qa'>
<img src='https://gitlab.cern.ch/ai/it-puppet-module-dirac/badges/qa/build.svg'></a>
<img src='https://gitlab.cern.ch/ai/it-puppet-module-dirac/badges/qa/pipeline.svg'></a>
</td>
<td>
<a href='https://gitlab.cern.ch/ai/it-puppet-module-dirac/commits/modulesync'>
<img src='https://gitlab.cern.ch/ai/it-puppet-module-dirac/badges/modulesync/build.svg'></a>
<img src='https://gitlab.cern.ch/ai/it-puppet-module-dirac/badges/modulesync/pipeline.svg'></a>
</td>
<td>
<a href="https://gitlab.cern.ch/ai/it-puppet-module-dirac/commits/qa">
......@@ -30,7 +30,8 @@
<br/>
Quick links:
* [Module documentation](code/README.md)
* [Module readme](code/README.md) (may not exist)
* [Module reference](code/REFERENCE.md) (may not exist)
* [Module metadata](code/metadata.json)
* [Code directory](code/)
* [Files directory](code/files)
......
ci/.bundle/config 0 → 100644
+ 3
− 0
View file @ ca7b7bca
---
BUNDLE_PATH: "~/.aigems"
BUNDLE_DISABLE_SHARED_GEMS: "true"
ci/Dockerfile
+ 1
− 0
View file @ ca7b7bca
......@@ -15,6 +15,7 @@ RUN yum clean all && yum -y update && \
yum -y install centos-release-scl \
yum -y install rh-ruby25-rubygem-rake rh-ruby25-rubygem-bundler rh-ruby25-ruby-devel rh-ruby24-rubygem-rake rh-ruby24-rubygem-bundler rh-ruby24-ruby-devel rubygem-bundler git ruby-devel gcc-c++ make augeas-devel openssh-clients git libxslt-devel rubygem-nokogiri openldap-devel unzip && \
yum install --nogpgcheck -y http://linuxsoft.cern.ch/internal/repos/ai7-stable/x86_64/os/Packages/rubygem-yaml-lint-0.0.4-2.ai7.noarch.rpm && \
yum -y install dmidecode which && \
yum clean all
COPY . /it-puppet-module-dirac
......
ci/Gemfile
+ 10
− 25
View file @ ca7b7bca
......@@ -11,47 +11,32 @@ def location_for(place, fake_version = nil)
end
group :test do
gem 'puppetlabs_spec_helper', '~> 2.11.0', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'puppetlabs_spec_helper', '>= 2.14.0', :require => false
gem 'rspec-puppet-facts', '>= 1.9.5', :require => false
gem 'rspec-puppet-utils', :require => false
gem 'rspec_junit_formatter', :require => false
gem 'puppet-lint-leading_zero-check', :require => false
gem 'puppet-lint-trailing_comma-check', :require => false
gem 'puppet-lint-version_comparison-check', :require => false
gem 'puppet-lint-classes_and_types_beginning_with_digits-check', :require => false
gem 'puppet-lint-unquoted_string-check', :require => false
gem 'puppet-lint-variable_contains_upcase', :require => false
gem 'puppet-lint-absolute_classname-check', '>= 2.0.0', :require => false
gem 'puppet-lint-topscope-variable-check', :require => false
gem 'puppet-lint-legacy_facts-check', :require => false
gem 'puppet-lint-cern_legacy_facts-check', :require => false, :git => 'https://gitlab.cern.ch/ai-config-team/puppet-lint-cern_legacy_facts-check.git'
gem 'puppet-lint-anchor-check', :require => false
gem 'metadata-json-lint', :require => false
gem 'puppet-blacksmith', :require => false
gem 'rubocop', '~> 0.66.0', :require => false
gem 'rubocop-rspec', '~> 1.32.0', :require => false
gem 'rubocop', '~> 0.49.1', :require => false
gem 'rubocop-rspec', '~> 1.15.0', :require => false
gem 'mocha', '~> 1.4.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'rack', '~> 1.0', :require => false if RUBY_VERSION < '2.2.2'
gem 'parallel_tests', :require => false
gem 'ruby-ldap', :require => false
gem 'net-ldap', :require => false
end
group :development do
gem 'travis', :require => false
gem 'travis-lint', :require => false
gem 'guard-rake', :require => false
end
group :system_tests do
gem 'beaker', :require => false
if beaker_version = ENV['BEAKER_VERSION']
gem 'beaker', *location_for(beaker_version)
end
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
gem 'beaker-rspec', *location_for(beaker_rspec_version)
else
gem 'beaker-rspec', :require => false
end
gem 'beaker-puppet_install_helper', :require => false
end
if facterversion = ENV['FACTER_GEM_VERSION']
......
ci/boilerplate/metadata.json
+ 6
− 0
View file @ ca7b7bca
......@@ -7,6 +7,12 @@
"source": "https://gitlab.cern.ch/ai/it-puppet-module-dirac",
"dependencies": [
],
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 5.5.8 < 7.0.0"
}
],
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
......
code/manifests/init.pp
+ 6
− 6
View file @ ca7b7bca
......@@ -55,7 +55,7 @@ class dirac ($dirac_user = 'dirac', $dirac_group = 'dirac',
# Retrieve the fully qualified name
# This is used in templates
$server_name = hiera('server_name', $::fqdn)
$server_name = hiera('server_name', $facts['networking']['fqdn'])
# If we install the machine as a web portal, we have to add
# 'WebApp' to the extensions
......@@ -147,7 +147,7 @@ class dirac ($dirac_user = 'dirac', $dirac_group = 'dirac',
require => Yumrepo['repo-for-runit'],
}
if versioncmp($::operatingsystemmajrelease,'6') == 0 {
if versioncmp($facts['os']['release']['major'],'6') == 0 {
file {'/etc/init/runsvdir.conf':
ensure => present,
owner => 'root',
......@@ -156,7 +156,7 @@ class dirac ($dirac_user = 'dirac', $dirac_group = 'dirac',
source => 'puppet:///modules/dirac/runsvdir.conf',
}
}
elsif versioncmp($::operatingsystemmajrelease, '7') == 0 {
elsif versioncmp($facts['os']['release']['major'], '7') == 0 {
file {'/usr/lib/systemd/system/runsvdir-start.service':
ensure => present,
owner => 'root',
......@@ -280,10 +280,10 @@ class dirac ($dirac_user = 'dirac', $dirac_group = 'dirac',
if $logstash_server {
if versioncmp($::operatingsystemmajrelease,'6') == 0 {
if versioncmp($facts['os']['release']['major'],'6') == 0 {
notify { 'Cannot install logstash on SLC6':}
}
elsif versioncmp($::operatingsystemmajrelease, '7') == 0 {
elsif versioncmp($facts['os']['release']['major'], '7') == 0 {
yumrepo { 'logstash-6.x':
descr => 'CentOS/RHEL Logstash repository for 6.x packages',
baseurl => 'http://linuxsoft.cern.ch/mirror/artifacts.elastic.co/packages/6.x/yum/',
......@@ -293,7 +293,7 @@ class dirac ($dirac_user = 'dirac', $dirac_group = 'dirac',
priority => 99,
}
class {'::logstash':
class {'logstash':
status => 'enabled',
manage_repo => false,
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment