(CAT-2051): Replaced centos-7 with rhel-7 and removed a repo link which returned 404

Author: span786

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix: {'platform':['centos-7'],'collection':['puppet7-nightly', 'puppet8-nightly']}
+      matrix: {'platform':['rhel-7'],'collection':['puppet7-nightly', 'puppet8-nightly']}
 
     steps:
     - name: Checkout Source

.github/workflows/nightly.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
-      matrix: {'platform':['centos-7'],'collection':['puppet7-nightly', 'puppet8-nightly']}
+      matrix: {'platform':['rhel-7'],'collection':['puppet7-nightly', 'puppet8-nightly']}
 
     steps:
     - name: Checkout Source

Gemfile

@@ -39,6 +39,7 @@ end
 group :development, :release_prep do
   gem "puppet-strings", '~> 4.0',         require: false
   gem "puppetlabs_spec_helper", '~> 7.0', require: false
+  gem 'puppet-modulebuilder', '~> 1.1',   require: false
 end
 group :system_tests do
   gem "puppet_litmus", '~> 1.0',   require: false, platforms: [:ruby, :x64_mingw]

spec/spec_helper_acceptance_local.rb

@@ -255,7 +255,7 @@ def execute_agent(role)
         run_shell('/sbin/iptables -F')
       end
     end
-    if %r{redhat|centos}.match?(family)
+    if %r{centos|rhel}.match?(family)
       runtime = 'docker'
       cni = 'weave'
       ['controller', 'worker1', 'worker2'].each do |node|
@@ -271,7 +271,6 @@ def execute_agent(role)
         run_shell('usermod -aG docker $(whoami)')
         run_shell('systemctl start docker.service')
         run_shell('systemctl enable docker.service')
-        create_remote_file('k8repo', '/etc/yum.repos.d/kubernetes.repo', k8repo)
         run_shell('yum install -y kubectl')
       end
     end