(SIMP-8827) Update simp-doc version, GLCI jobs (#712)

* (SIMP-8827) Update simp-doc to 6.5.0-3

simp-doc 6.5.0-3 includes the announcement of the EOL & immediate
deprecation of of EL6.

[SIMP-8827] #close #comment Update simp-doc to 6.5.0-3
[SIMP-8828] #close #comment Remove EL6 tests from GitLab CI pipeline
[SIMP-8829] #close #comment Copy validate/metadata checks to GitLab CI

* (SIMP-8830) Remove EL6 from acceptance tests

[SIMP-8830] #close

.gitlab-ci.yml

@@ -1,4 +1,10 @@
 ---
+stages:
+  - 'validation'
+  - 'integration'
+
+image: 'ruby:2.5'
+
 .cache_bundler: &cache_bundler
   cache:
     untracked: true
@@ -20,10 +26,15 @@
     - 'rm -rf pkg/ || :'
     - bundle check || rm -f Gemfile.lock && ("${BUNDLER_INSTALL[@]}" --local || "${BUNDLER_INSTALL[@]}")
 
-stages:
-  - integration
+.pup_6_18_0: &pup_6_18_0
+  variables:
+    PUPPET_VERSION: '6.18.0'
+    BEAKER_PUPPET_COLLECTION: 'puppet6'
 
-image: 'ruby:2.5'
+.pup_6_18_0__oracle: &pup_6_18_0__oracle
+  variables:
+    PUPPET_VERSION: '6.18.0'
+    BEAKER_PUPPET_COLLECTION: 'puppet6'
 
 # Anchor to disable release flavored tests, and run them only when
 # the environment variable SIMP_RELEASE_TESTS is set in the GitLab repo settings
@@ -45,31 +56,32 @@ image: 'ruby:2.5'
       - $SIMP_FULL_MATRIX
       - $SIMP_IPA_TEST
 
-default_el6-puppet6:
-  stage: integration
+# Pipeline / testing matrix
+# =============================================================================
+
+releng_checks:
+  stage: 'validation'
   image: 'ruby:2.5'
-  tags:
-    - beaker
-  <<: *cache_bundler
+  tags: ['docker']
+  <<: *pup_6_18_0
   <<: *setup_bundler_env
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
   script:
-    - bundle exec rake spec_clean
-    - bundle exec rake beaker:suites[default,el6_server]
-  retry: 1
+    - 'command -v rpm || if command -v apt-get; then apt-get update; apt-get install -y rpm; fi ||:'
+    - 'SIMP_RPM_dist=.el7 bundle exec rake check:dot_underscore'
+    - 'SIMP_RPM_dist=.el7 bundle exec rake check:test_file'
+    - 'SIMP_RPM_dist=.el7 bundle exec rake metadata_lint'
+    - 'bundle exec rake check:pkglist_lint'
+
+# Acceptance tests
+# ==============================================================================
 
 default_el7-puppet6:
   stage: integration
-  image: 'ruby:2.5'
   tags:
     - beaker
   <<: *cache_bundler
   <<: *setup_bundler_env
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
+  <<: *pup_6_18_0
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[default,el7_server]
@@ -78,148 +90,64 @@ default_el7-puppet6:
 
 ipa_el7-puppet6:
   stage: integration
-  image: 'ruby:2.5'
   tags:
     - beaker
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *only_with_SIMP_FULL_MATRIX_or_SIMP_IPA_TEST
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
+  <<: *pup_6_18_0
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[ipa,el7_server]
   retry: 1
 
-# # IPA server has issues on el6
-# ipa_el6-puppet6:
-#   stage: integration
-#  image: 'ruby:2.5'
-#   tags:
-#     - beaker
-#   <<: *cache_bundler
-#   <<: *setup_bundler_env
-#   <<: *only_with_SIMP_FULL_MATRIX_or_SIMP_IPA_TEST
-#   variables:
-#     PUPPET_VERSION: '~> 6.18'
-#     BEAKER_PUPPET_COLLECTION: 'puppet6'
-#   script:
-#     - bundle exec rake beaker:suites[ipa,el6_server]
-#   retry: 1
-
-
-default_oel6-puppet6:
-  stage: integration
-  image: 'ruby:2.5'
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *only_with_SIMP_FULL_MATRIX
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
-    SIMP_BEAKER_OS: 'oracle'
-  script:
-    - bundle exec rake spec_clean
-    - bundle exec rake beaker:suites[default,el6_server]
-  retry: 1
-
 default_oel7-puppet6:
   stage: integration
-  image: 'ruby:2.5'
   tags:
     - beaker
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *only_with_SIMP_FULL_MATRIX
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
-    SIMP_BEAKER_OS: 'oracle'
+  <<: *pup_6_18_0__oracle
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[default,el7_server]
   retry: 1
 
 ipa_oel7-puppet6:
   stage: integration
-  image: 'ruby:2.5'
   tags:
     - beaker
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *only_with_SIMP_FULL_MATRIX_or_SIMP_IPA_TEST
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
-    SIMP_BEAKER_OS: 'oracle'
+  <<: *pup_6_18_0__oracle
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[ipa,el7_server]
   retry: 1
 
-
-rpm_el6-puppet6:
-  stage: integration
-  image: 'ruby:2.5'
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *only_with_SIMP_RELEASE_TESTS
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
-  script:
-    - bundle exec rake spec_clean
-    - bundle exec rake beaker:suites[install_from_rpm,el6_server]
-  retry: 1
-
 rpm_el7-puppet6:
   stage: integration
-  image: 'ruby:2.5'
   tags:
     - beaker
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *only_with_SIMP_RELEASE_TESTS
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
+  <<: *pup_6_18_0
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[install_from_rpm,el7_server]
   retry: 1
 
-forge_install_el6-puppet6:
-  stage: integration
-  image: 'ruby:2.5'
-  tags:
-    - beaker
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *only_with_SIMP_RELEASE_TESTS
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
-  script:
-    - bundle exec rake spec_clean
-    - bundle exec rake beaker:suites[install_from_core_module,el6_server]
-  retry: 1
-
 forge_install_el7-puppet6:
   stage: integration
-  image: 'ruby:2.5'
   tags:
     - beaker
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *only_with_SIMP_RELEASE_TESTS
-  variables:
-    PUPPET_VERSION: '~> 6.18'
-    BEAKER_PUPPET_COLLECTION: 'puppet6'
+  <<: *pup_6_18_0
   script:
     - bundle exec rake spec_clean
     - bundle exec rake beaker:suites[install_from_core_module,el7_server]

Puppetfile.pinned

@@ -16,7 +16,7 @@ moduledir 'src'
 
 mod 'simp-doc',
   :git => 'https://github.com/simp/simp-doc',
-  :tag => '6.5.0-2'
+  :tag => '6.5.0-3'
 
 moduledir 'src/assets'
 

spec/acceptance/helpers/expect_script_helper.rb

@@ -9,8 +9,13 @@ module ExpectScriptHelper
       # Using the (ASSUMED) optional, final command line argument in an expect
       # script, adjust ciphers used by that script to ssh from src_host to
       # dest_host, if necessary.  This ugly adjustment is needed in order to
-      # deal with different cipher sets configured by SIMP for sshd for CentOS 6
-      # versus CentOS 7.
+      # deal with different cipher sets configured by SIMP for sshd for
+      # different versions of CentOS.
+      #
+      # NOTE: this is probably possible to remove in favor of overriding the
+      # net-ssh options in the Beaker nodeset, which wasn't possible when
+      # SIMP-5082 was submitted.  However, that will need to wait for a future
+      # patch.
       #
       # Returns the expect command
       def adjust_ssh_ciphers_for_expect_script(expect_cmd, src_host, dest_host)
@@ -19,8 +24,6 @@ def adjust_ssh_ciphers_for_expect_script(expect_cmd, src_host, dest_host)
         dest_os_major = fact_on(dest_host, 'operatingsystemmajrelease')
         if src_os_major.to_s == '7'
           cmd +=" '-o MACs=hmac-sha1'" if (dest_os_major.to_s == '6')
-        elsif src_os_major.to_s == '6'
-          cmd +=" '-o MACs=hmac-sha2-256'" if (dest_os_major.to_s == '7')
         end
         cmd
       end

spec/acceptance/helpers/repo_helper.rb

@@ -36,14 +36,10 @@ def install_puppet_repo(host)
           puts("Using Puppet #{puppet_collection} repo from yum.puppetlabs.com")
           puts('='*72)
 
-          if host.host_hash[:platform] =~ /el-8/
-            family = 'el-8'
-          elsif host.host_hash[:platform] =~ /el-7/
-            family = 'el-7'
-          elsif host.host_hash[:platform] =~ /el-6/
-            family = 'el-6'
+          if host.host_hash[:platform] =~ /(el-[78])/
+            family = $1
           else
-            fail("install_puppet_repo(): Cannot determine puppet repo for #{host.name}")
+            fail("install_puppet_repo(): No supported OS platform found for #{host.name}; unable to determine puppet repo")
           end
           url = "http://yum.puppetlabs.com/#{puppet_collection}/#{puppet_collection}-release-#{family}.noarch.rpm"
           on(host, "yum install #{url} -y")

spec/acceptance/nodesets/default.yml

@@ -3,15 +3,12 @@
 
   case ENV['SIMP_BEAKER_OS']
   when /centos/ || /^el/
-    box_6 = 'centos/6'
     box_7 = 'centos/7'
     box_8 = 'centos/8'
   when /oracle/ || /^oel/
-    box_6 = 'onyxpoint/oel-6-x86_64'
     box_7 = 'onyxpoint/oel-7-x86_64'
     box_8 = 'generic/oracle8'
   else
-    box_6 = 'centos/6'
     box_7 = 'centos/7'
     box_8 = 'centos/8'
   end
@@ -45,22 +42,6 @@ HOSTS:
     box:        <%= box_7 %>
     hypervisor: <%= hypervisor %>
 
-  agent-el6:
-    roles:
-      - agent
-    platform:   el-6-x86_64
-    box:        <%= box_6 %>
-    hypervisor: <%= hypervisor %>
-    ssh:
-      host_key:
-        - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:host_key].join("\n        - ") %>
-      kex:
-        - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:kex].join("\n        - ") %>
-      encryption:
-        - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n        - ") %>
-      hmac:
-        - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n        - ") %>
-
 CONFIG:
   log_level: verbose
   type:      aio