(SIMP-5326) Add support for Beaker 4 (#118)

* update CI ruby version * bump to beaker-helpers 1.11
simp · Sep 25, 2018 · 53331ad · 53331ad
1 parent 5a74e1f
commit 53331ad
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 78 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -5,8 +5,6 @@
 # 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)
@@ -54,56 +52,6 @@ stages:
   - 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
-  variables:
-    PUPPET_VERSION: '~> 4.7.0'
-  <<: *cache_bundler_r2_1
-  <<: *setup_bundler_env
-  <<: *validation_checks
-
-pup4.7-unit:
-  stage: unit
-  tags:
-    - docker
-  image: ruby:2.1
-  variables:
-    PUPPET_VERSION: '~> 4.7.0'
-  <<: *cache_bundler_r2_1
-  <<: *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.1
-  variables:
-    PUPPET_VERSION: '~> 4.8.0'
-  <<: *cache_bundler_r2_1
-  <<: *setup_bundler_env
-  <<: *validation_checks
-
-pup4.8-unit:
-  stage: unit
-  tags:
-    - docker
-  image: ruby:2.1
-  variables:
-    PUPPET_VERSION: '~> 4.8.0'
-  <<: *cache_bundler_r2_1
-  <<: *setup_bundler_env
-  <<: *spec_tests
-
 
 # Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21)
 # See: https://puppet.com/misc/puppet-enterprise-lifecycle

diff --git a/.travis.yml b/.travis.yml
@@ -21,20 +21,20 @@ before_install:
 jobs:
   include:
     - stage: spec
-      rvm: 2.1.9
+      rvm: 2.4.4
       script:
         - bundle exec rake spec
 
     - stage: acceptance
       sudo: required
-      rvm: 2.1.9
+      rvm: 2.4.4
       services:
         - docker
       script:
         - travis_wait 30 unbuffer bundle exec rake acceptance
 
     - stage: deploy
-      rvm: 2.1.9
+      rvm: 2.4.4
       script:
         - true
       before_deploy:
@@ -48,12 +48,12 @@ jobs:
             secure: "aoPmOZ3WgjNJ56UXmamKxaRv37iUaxKekAeS8n2fPk78X/nU2qGjdDHFH+SBrfl33PyzsGnS3WAANMKaIkAgssvKoaII/sAC+Sl6q1eyVUprZqloXrG+cHlnHY4GnziWEH3JrkHDChW0xoJq7hhpj7qTRKrEIp6nA25MjozjveoL+HH4kKy/ACJhiEdsYTFaDLYYFY50gGUL9KjIkwN6g9d+dIzG9JqcYoDbneQlO6/23yr4GiAHQ8HM1j5tUoBqJad+CWjWhSY7pbfYBy2ziwVhFy1qoOS4/bhlasRCsLTtz0AjjR0YWOhJap1vJqYhrSxtvhmVuzScmDkueAem/PfWS3XCQvbmjdmFMzPOxo0aRRJMlaeVWRsZ/aVFC7ngpRzokq1duZEKI47xZC27vJSOp3RZMmYl/7GsykoYkqHHsTvzSALEQiVtQq8sIOtN0JOTFI8H4LSMirXuqGq+SgCJiAQ3mQzSgh50TXiZaA2UPPcQaw4AzY36BRKs1cgw3cEWuL38O2cWUTAzEE4SUh499wrU5x+N0PsYL0AvMFONsRaq5epOYrlIL9UPSL/qZRLmzpcEWZRfOX4Ni5N6Aa9ZR8juenR6UmE79S2dupBxQeinkdfXuWznUZH7BcnUDoz8rErABpJGHNVY60dUO/s055WCr7Y95Gi+H75X9/I="
           on:
             tags: true
-            rvm: 2.1.9
+            rvm: 2.4.4
             condition: '($SKIP_PUBLISH != true)'
         - provider: releases
           api_key:
             secure: "QKvAL4yAk8u9prJT6dFzKvszJfoo5/R9jIJ/WEUwdH17jij9Q/XhNrUzJZnrdVtqq4yCK6UqGqkRMMn2YLOKthoJycLEXzH+ZeCxBwzyN6uQkLmK5Mx43H+NNCsRkYTmcOdi4wJraWaWVq7XBxz6XdNRUkV99WyIh93wVnTwZuJxvF9koDFq+lRR4qRPh5Xn8HjKEZNPY7QHaecqsyWjgdEILWaQk/32IU20dLCT7U3jDdSuk92p24gWlkvTJ/gP+IYKWEPhgMMpx+WAtGGC+djMyZUrkaKEa/ennkOcFgqJ6UtDEInEtTBFWScGL70dwHORbEVExp9AKcLP3TmMyQ/36ybu7yrgcp6L995tM4Huez3GBM6NJ8xl/hYG3D1QwwoXGnWfUjQW2we7h8gcvl2yUSx59pb2V5QW3nCbD8rAiF/kpAcgwWyBT3iLpMer2j0Ux05NCBGqsltl9J944M+pLtO+YKldUw7uGDWMQQzq8/2m5+MoE4fvTgnaJ0rv0eRLWfNH2RQ565mE95nyJC/wXz/XB2v/KKHrf8FQZRIavH4Nuo4E2+tU8u2APU/n+gP8iQrtd86Nlo5RrBTu+NoDPDrM5OBnVYTT/AUAEUggXTPgZsqwZrSDSBEt0VbExnwQ5QMGIB9ZX+ZunrEZ6NeH8hV5hm67WYZ+qRFOPvI="
           on:
             tags: true
-            rvm: 2.1.9
+            rvm: 2.4.4
             condition: '($SKIP_PUBLISH != true)'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 5.6.0 / 2018-09-09
+* Add support for Beaker 4
+
 ### 5.5.3 / 2018-08-28
 * Fix issue where the `pkg:signrpms` rake task would not honor 'force'
 * Add a check for the existence of /usr/local/sbin/simp_rpm_helper, before

diff --git a/lib/simp/rake/helpers/version.rb b/lib/simp/rake/helpers/version.rb
@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.5.3'
+  VERSION = '5.6.0'
 end
diff --git a/simp-rake-helpers.gemspec b/simp-rake-helpers.gemspec
@@ -23,28 +23,22 @@ Gem::Specification.new do |s|
   #   for the published gem
   # ensure the gem is built out of versioned files
 
-  s.add_runtime_dependency 'bundler',                   '~> 1.14'
-  s.add_runtime_dependency 'rake',                      '>= 10.0', '< 13.0'
-  s.add_runtime_dependency 'coderay',                   '~> 1.0'
-  s.add_runtime_dependency 'puppet',                    '>= 3.0', '< 6.0'
-  s.add_runtime_dependency 'puppet-lint',               '>= 1.0', '< 3.0'
-  s.add_runtime_dependency 'puppetlabs_spec_helper',    '~> 2.0'
-  s.add_runtime_dependency 'parallel',                  '~> 1.0'
-  s.add_runtime_dependency 'simp-rspec-puppet-facts',   '~> 2.0'
-  s.add_runtime_dependency 'puppet-blacksmith',         '~> 3.3'
-  s.add_runtime_dependency 'simp-beaker-helpers',       '~> 1.0'
-  s.add_runtime_dependency 'parallel_tests',            '~> 2.4'
-  s.add_runtime_dependency 'r10k',                      '~> 2.2'
-  s.add_runtime_dependency 'pager'
-  s.add_runtime_dependency 'rspec',                     '~> 3.0'
-  s.add_runtime_dependency 'beaker',                    '~> 3.14'
-  s.add_runtime_dependency 'beaker-rspec',              '~> 6.1'
-  s.add_runtime_dependency 'rspec-core',                '~> 3.0'
+  s.add_runtime_dependency 'simp-beaker-helpers',     '~> 1.11'
+  s.add_runtime_dependency 'bundler',                 '~> 1.14'
+  s.add_runtime_dependency 'rake',                    '>= 10.0', '< 13.0'
+  s.add_runtime_dependency 'puppet',                  '>= 3.0', '< 6.0'
+  s.add_runtime_dependency 'puppet-lint',             '>= 1.0', '< 3.0'
+  s.add_runtime_dependency 'puppetlabs_spec_helper',  '~> 2.0'
+  s.add_runtime_dependency 'parallel',                '~> 1.0'
+  s.add_runtime_dependency 'simp-rspec-puppet-facts', '~> 2.0'
+  s.add_runtime_dependency 'puppet-blacksmith',       '~> 3.3'
+  s.add_runtime_dependency 'parallel_tests',          '~> 2.4'
+  s.add_runtime_dependency 'r10k',                    '~> 2.2'
+  s.add_runtime_dependency 'pager',                   '~> 1.0'
 
   # for development
   s.add_development_dependency 'pry',         '~> 0.0'
   s.add_development_dependency 'pry-doc',     '~> 0.0'
-  s.add_development_dependency 'highline',    '~> 1.6', '> 1.6.1'  # 1.8 safe
 
   s.files = Dir[
                 'Rakefile',

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
@@ -13,7 +13,7 @@ HOSTS:
       - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
       - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
-      - 'yum install -y facter'
+      - 'yum install -y facter rubygem-json'
       # simp build-deps
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools which'
       # rvm build-deps
@@ -42,7 +42,7 @@ HOSTS:
       - "echo 'Defaults:build_user !requiretty' >> /etc/sudoers"
       - "echo 'build_user ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers"
       - 'useradd -b /home -m -c "Build User" -s /bin/bash -U build_user'
-      - 'yum install -y facter'
+      - 'yum install -y facter rubygem-json'
       # simp build-deps
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools clamav-update which'
       # rvm build-deps