Skip to content

Commit

Permalink
(SIMP-4009) Validate against Puppet 5 and OEL (#25)
Browse files Browse the repository at this point in the history
* (SIMP-4009) Validate against Puppet 5 and OEL

* Tested against Puppet 5
* Tested against OEL

SIMP-4009 #comment Update acpid
  • Loading branch information
trevor-vaughan authored and ayohrling committed Jul 18, 2018
1 parent ef6fcf5 commit 6bf4a4f
Show file tree
Hide file tree
Showing 11 changed files with 394 additions and 191 deletions.
5 changes: 2 additions & 3 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
---
fixtures:
repositories:
stdlib:
repo: https://github.com/simp/puppetlabs-stdlib
brach: master
simplib: https://github.com/simp/pupmod-simp-simplib
stdlib: https://github.com/simp/puppetlabs-stdlib
symlinks:
acpid: "#{source_dir}"
305 changes: 227 additions & 78 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,97 +1,246 @@
# The testing matrix considers ruby/puppet versions supported by SIMP and PE:
#
# https://puppet.com/docs/pe/2017.3/overview/component_versions_in_recent_pe_releases.html
# https://puppet.com/misc/puppet-enterprise-lifecycle
# https://puppet.com/docs/pe/2017.3/overview/getting_support_for_pe.html#standard-releases-and-long-term-support-releases
# ------------------------------------------------------------------------------
# release pup ruby eol
# PE 2016.4 4.7 2.1.9 2018-10 (LTS)
# SIMP6.0.0 4.8 2.1.9 TBD
# PE 2017.2 4.10 2.1.9 2018-02-21
# PE 2017.3 5.3 2.4.1 2018-07
# PE 2018.1 ??? ????? ????-?? (LTS)
---
puppet-syntax:
stage: test
tags:
- docker
image: ruby:2.1
script:
- bundle install
.cache_bundler: &cache_bundler
cache:
untracked: true
# A broad attempt at caching between runs (ala Travis CI)
key: "${CI_PROJECT_NAMESPACE}__bundler"
paths:
- '.vendor'
- 'vendor'

.setup_bundler_env: &setup_bundler_env
before_script:
- 'echo Files in cache: $(find .vendor | wc -l) || :'
- 'export GEM_HOME=.vendor/gem_install'
- 'export BUNDLE_CACHE_PATH=.vendor/bundler'
- 'declare GEM_BUNDLER_VER=(-v ''~> ${BUNDLER_VERSION:-1.16.0}'')'
- declare GEM_INSTALL=(gem install --no-document)
- declare BUNDLER_INSTALL=(bundle install --no-binstubs --jobs $(nproc) --path=.vendor "${FLAGS[@]}")
- gem list -ie "${GEM_BUNDLE_VER[@]}" --silent bundler || "${GEM_INSTALL[@]}" --local "${GEM_BUNDLE_VER[@]}" bundler || "${GEM_INSTALL[@]}" "${GEM_BUNDLE_VER[@]}" bundler
- 'rm -rf pkg/ || :'
- bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL[@]}" --local || "${BUNDLER_INSTALL[@]}")


.validation_checks: &validation_checks
script:
- bundle exec rake syntax
puppet-lint:
stage: test
tags:
- docker
image: ruby:2.1
script:
- bundle install
- bundle exec rake check:dot_underscore
- bundle exec rake check:test_file
- bundle exec rake pkg:check_version
- bundle exec rake pkg:compare_latest_tag
- bundle exec rake lint
puppet-metadata:
stage: test
tags:
- bundle exec rake clean
- bundle exec puppet module build

.spec_tests: &spec_tests
script:
- bundle exec rake spec

stages:
- validation
- unit
- acceptance
- deploy

# Puppet 4.7 for PE 2016.4 LTS Support (EOL: 2018-10-21)
# See: https://puppet.com/misc/puppet-enterprise-lifecycle
# --------------------------------------
pup4_7-validation:
stage: validation
tags:
- docker
image: ruby:2.1
script:
- bundle install
- bundle exec rake metadata
unit-test-ruby-2.1:
stage: test
tags:
variables:
PUPPET_VERSION: '~> 4.7.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *validation_checks

pup4_7-unit:
stage: unit
tags:
- docker
image: ruby:2.1
script:
- bundle install
- bundle exec rake spec
unit-test-ruby-2.2:
stage: test
tags:
variables:
PUPPET_VERSION: '~> 4.7.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *spec_tests


# Puppet 4.8 for SIMP 6.0 + 6.1 support
# --------------------------------------
pup4_8-validation:
stage: validation
tags:
- docker
image: ruby:2.2
allow_failure: true
script:
- bundle install
- bundle exec rake spec
unit-test-ruby-2.3:
stage: test
tags:
image: ruby:2.1
variables:
PUPPET_VERSION: '~> 4.8.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *validation_checks

pup4_8-unit:
stage: unit
tags:
- docker
image: ruby:2.3
allow_failure: true
script:
- bundle install
- bundle exec rake spec
image: ruby:2.1
variables:
PUPPET_VERSION: '~> 4.8.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *spec_tests


# For PE LTS Support
# Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21)
# See: https://puppet.com/misc/puppet-enterprise-lifecycle
puppet4.7-syntax:
stage: test
tags:
# --------------------------------------
pup4_10-validation:
stage: validation
tags:
- docker
image: ruby:2.1
script:
- PUPPET_VERSION=4.7 bundle install
- PUPPET_VERSION=4.7 bundle exec rake syntax
unit-test-puppet4.7-ruby-2.1:
stage: test
tags:
variables:
PUPPET_VERSION: '~> 4.10.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *validation_checks

pup4_10-unit:
stage: unit
tags:
- docker
image: ruby:2.1
script:
- PUPPET_VERSION=4.7 bundle install
- PUPPET_VERSION=4.7 bundle exec rake spec
unit-test-puppet4.7-ruby-2.2:
stage: test
tags:
variables:
PUPPET_VERSION: '~> 4.10.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *spec_tests


# Puppet 5.3 for PE 2017.3 support (EOL: 2018-07)
# See: https://puppet.com/misc/puppet-enterprise-lifecycle
# --------------------------------------
pup5_3-validation:
stage: validation
tags:
- docker
image: ruby:2.4
variables:
PUPPET_VERSION: '~> 5.3.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *validation_checks

pup5_3-unit:
stage: unit
tags:
- docker
image: ruby:2.4
variables:
PUPPET_VERSION: '~> 5.3.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *spec_tests

# Keep an eye on the latest puppet 5
# ----------------------------------
pup5_latest-validation:
stage: validation
tags:
- docker
image: ruby:2.2
allow_failure: true
script:
- PUPPET_VERSION=4.7 bundle install
- PUPPET_VERSION=4.7 bundle exec rake spec
unit-test-puppet4.7-ruby-2.3:
stage: test
tags:
image: ruby:2.4
variables:
PUPPET_VERSION: '~> 5.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *validation_checks

pup5_latest-unit:
stage: unit
tags:
- docker
image: ruby:2.3
allow_failure: true
script:
- PUPPET_VERSION=4.7 bundle install
- PUPPET_VERSION=4.7 bundle exec rake spec

acceptance-test:
stage: test
tags:
image: ruby:2.4
variables:
PUPPET_VERSION: '~> 5.0'
<<: *cache_bundler
<<: *setup_bundler_env
<<: *spec_tests

# Acceptance tests
# ==============================================================================
default:
stage: acceptance
tags:
- beaker
<<: *cache_bundler
<<: *setup_bundler_env
variables:
PUPPET_VERSION: '~> 4.10.0'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default]

default-puppet5:
stage: acceptance
tags:
- beaker
<<: *cache_bundler
<<: *setup_bundler_env
variables:
PUPPET_VERSION: '~> 5.3'
BEAKER_PUPPET_COLLECTION: 'puppet5'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default]

default-oel:
stage: acceptance
tags:
- beaker
<<: *cache_bundler
<<: *setup_bundler_env
variables:
PUPPET_VERSION: '~> 4.10.0'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default,oel]

default-oel-puppet5:
stage: acceptance
tags:
- beaker
<<: *cache_bundler
<<: *setup_bundler_env
variables:
PUPPET_VERSION: '~> 5.3'
BEAKER_PUPPET_COLLECTION: 'puppet5'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default,oel]

default-fips:
stage: acceptance
tags:
- beaker
script:
- bundle install --no-binstubs --path=vendor
- bundle exec rake acceptance
<<: *cache_bundler
<<: *setup_bundler_env
variables:
PUPPET_VERSION: '~> 4.10.0'
BEAKER_fips: 'yes'
script:
- bundle exec rake spec_clean
- bundle exec rake beaker:suites[default]
5 changes: 0 additions & 5 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
--log-format="%{path}:%{line}:%{check}:%{KIND}:%{message}"
--relative
--no-class_inherits_from_params_class-check
--no-140chars-check
--no-empty_string-check
--no-trailing_comma-check
# This is here because the code can't handle lookups in parameters and we have
# a LOT of those
--no-parameter_order-check
Loading

0 comments on commit 6bf4a4f

Please sign in to comment.