r10k 3.15.4 → 3.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2300d770bc6d49649bacd705ec99dfb416ac7ab7ca2a0b59246ba12623622253
-  data.tar.gz: bf8e2b45aa052d46b8abe55cc8e1364e48aa4d9f70621280ec7d114c94f1a95e
+  metadata.gz: 4e049f760aad80be6b528604923d13227e763698f1a99aeea0b216e747aac75d
+  data.tar.gz: 1e8eae627184409c3c9cc3a5ee903f480067bd780b2b7c935cce82e03cad8938
 SHA512:
-  metadata.gz: 7544a56bf9f5e135b899c95dca1f7dc12ecd0aefa006ccc847a5407dd10d53945d5a58b16220d6fe228a596c853323b7c49da05e530ddf49388759bc7b88309e
-  data.tar.gz: 394171c0c00105467c9a23af8444f36935f2042c1f67c1359fa36c3e856dbcdea50f1440a4a8593339314d6783c673994728a1150547e4c4f4faeb2253107300
+  metadata.gz: bfc734f0e05e6dda9d82bf28e0c203e65821a98258f75fc7caed5b5173aff78ac8a90234768ce43dfca6d41652a25a2f555bddd5da5d6d28074f4978a06b0599
+  data.tar.gz: 9b17e3cc731a65e4a8cf0c612cfd037eb02d09b57ffeaa359076ce8081c3214b4509181c215e4e13613561b73c8e02e36e8507a5d34194abbcbd5bceec825e49

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+# raise PRs for gem updates
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.github/workflows/docker.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - uses: azure/docker-login@v1
         with: # This doesn't seem to work unless we point directly to the secrets
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -27,11 +27,11 @@ jobs:
         with:
           ruby-version: 2.6.x
       - run: gem install bundler
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Build container
         working-directory: docker
         run: |

data/.github/workflows/release.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - 3.x
     paths:
       - 'lib/r10k/version.rb'
 
@@ -11,11 +12,11 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
       - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@1.35.0
+        uses: anothrNick/github-tag-action@1.67.0
         env:
           GITHUB_TOKEN: ${{ secrets.PUPPET_RELEASE_GH_TOKEN }}
           DEFAULT_BUMP: patch

data/.github/workflows/rspec_tests.yml

@@ -11,12 +11,12 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {os: ubuntu-18.04, ruby: 2.4}
-          - {os: ubuntu-18.04, ruby: 2.5}
-          - {os: ubuntu-18.04, ruby: 2.6}
-          - {os: ubuntu-18.04, ruby: 2.7}
-          - {os: ubuntu-18.04, ruby: 3.1}
-          - {os: ubuntu-18.04, ruby: jruby-9.2.10.0}
+          - {os: ubuntu-latest, ruby: 2.4}
+          - {os: ubuntu-latest, ruby: 2.5}
+          - {os: ubuntu-latest, ruby: 2.6}
+          - {os: ubuntu-latest, ruby: 2.7}
+          - {os: ubuntu-latest, ruby: 3.2}
+          - {os: ubuntu-latest, ruby: jruby-9.2.10.0}
           - {os: windows-2019, ruby: 2.5}
           - {os: windows-2019, ruby: 2.6}
           - {os: windows-2019, ruby: 2.7}
@@ -24,7 +24,7 @@ jobs:
     runs-on: ${{ matrix.cfg.os }}
     steps:
       - name: Checkout current PR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install ruby version ${{ matrix.cfg.ruby }}
         uses: ruby/setup-ruby@v1

data/.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v8
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 60

data/CHANGELOG.mkd

@@ -4,21 +4,44 @@ CHANGELOG
 Unreleased
 ----------
 
+3.16.2
+------
+
+- r10k::module::git: expose remote as getter  [#1379](https://github.com/puppetlabs/r10k/pull/1379)
+
+3.16.1
+------
+
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
+- Use the production forge for integration testing
+
+3.16.0
+------
+
+- Emit more debug output when modules fail to sync [#1347](https://github.com/puppetlabs/r10k/pull/1347)
+- Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337)
+- Update R10K proxy usage to follow newer rugged best practices [PE-35980](https://tickets.puppet.com/browse/PE-35980)
+- Update Acceptance tests to be compatible with Puppet 8 [#1349](https://github.com/puppetlabs/r10k/pull/1349)
+
 3.15.4
 ------
+
 - Pin dependencies to maintain support for old Ruby versions [#1329](https://github.com/puppetlabs/r10k/pull/1329)
 
 3.15.3
 ------
+
 - Fix dirty working copy debug logging [#1321](https://github.com/puppetlabs/r10k/pull/1321)
 - Allow gettext-setup < 2 for compatibility with Ruby 3.2 and Puppet 8 [#1325](https://github.com/puppetlabs/r10k/pull/1325)
 
 3.15.2
 ------
+
 - Implement exclude regex for puppetfile install [#1248](https://github.com/puppetlabs/r10k/issues/1248)
 
 3.15.1
 ------
+
 - Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)
 - Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316)
 

data/Gemfile

@@ -6,10 +6,10 @@ group :extra do
 end
 
 group :development do
-  gem 'simplecov', '~> 0.9.1'
+  gem 'simplecov', '~> 0.17.1'
   gem 'ruby-prof', :platforms => :ruby
 end
 
-if File.exists? "#{__FILE__}.local"
+if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

data/integration/Rakefile

@@ -69,7 +69,7 @@ rototiller_task :beaker_hostgenerator do |t|
     # This is a hack :(
     t.add_flag(:name => '', :default => 'centos7-64mdca-64.fa', :override_env => 'TEST_TARGET')
 
-    t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
+    t.add_flag(:name => '--global-config', :default => '{forge_host=forgeapi.puppet.com}', :override_env => 'BHG_GLOBAL_CONFIG')
   end
 end
 

data/integration/files/pre-suite/git_config.pp.erb

@@ -1,4 +1,4 @@
-$git_package = $osfamily ? {
+$git_package = $facts['os']['family'] ? {
   'Debian' => 'git-core',
   default  => 'git'
 }

data/integration/pre-suite/10_git_config.rb

@@ -23,9 +23,6 @@ pe_version = get_puppet_version(master)
 fail_test('This pre-suite requires PE 3.7 or above!') if pe_version < 3.7
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Read module path'
 on(master, puppet('config print basemodulepath')) do |result|
   (result.stdout.include? ':') ? separator = ':' : separator = ';'

data/integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb

@@ -19,7 +19,7 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 puppetfile =<<-EOS
 mod 'motd',
-  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
+  :git    => 'https://github.com/puppetlabs/puppetlabs-motd', :branch => 'main'
 EOS
 
 proxy_env_value = 'http://ferritsarebest.net:3219'
@@ -36,7 +36,7 @@ sources:
 CONF
 
 teardown do
-  master.clear_env_var('HTTP_PROXY')
+  master.clear_env_var('HTTPS_PROXY')
 
   step 'Restore Original "r10k" Config'
   on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
@@ -45,7 +45,7 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-master.add_env_var('HTTP_PROXY', proxy_env_value)
+master.add_env_var('HTTPS_PROXY', proxy_env_value)
 
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
@@ -64,7 +64,8 @@ git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_pat
 
 #test
 on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
-  regex = /(Couldn't|Could not) resolve proxy.*ferritsarebest\.net/i
+  # Rugged as of 0.28 has a different error message than shellgit
+  regex = /((failed to resolve address for)|(Could not resolve proxy:)) ferritsarebest\.net/
   assert(r.exit_code == 1, 'expected error code was not observed')
   assert_match(regex, r.stderr, 'The expected error message was not observed' )
 end

data/integration/tests/basic_functionality/proxy_specified_in_configuration.rb

@@ -50,7 +50,7 @@ forge:
 CONF
 
 #Verification
-squid_log_regex = /CONNECT forgeapi.puppetlabs.com:443/
+squid_log_regex = /CONNECT forgeapi.puppet(labs)?.com:443/
 
 #Teardown
 teardown do

data/integration/tests/basic_functionality/proxy_with_puppetfile.rb

@@ -21,7 +21,7 @@ remove_squid = "#{pkg_manager} remove -y squid"
 squid_log = "/var/log/squid/access.log"
 
 #Verification
-squid_log_regex = /CONNECT forgeapi.puppetlabs.com:443/
+squid_log_regex = /CONNECT forgeapi.puppet(labs)?.com:443/
 
 #Teardown
 teardown do

data/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb

@@ -10,7 +10,7 @@ confine(:to, :platform => ['el', 'ubuntu', 'sles'])
 
 if ENV['GIT_PROVIDER'] == 'shellgit'
   skip_test('Skipping test because removing Git from the system affects other "shellgit" tests.')
-elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 
@@ -87,7 +87,7 @@ step 'Remove "git" Package from System'
 if master_platform == 'RedHat'
   on(master, 'yum remove -y git')
 elsif master_platform == 'Debian'
-  if fact_on(master, "operatingsystemmajrelease") == '10.04'
+  if fact_on(master, "os.release.major") == '10.04'
     on(master, 'apt-get remove -y git-core')
   else
     on(master, 'apt-get remove -y git')

data/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb

@@ -8,7 +8,7 @@ confine(:to, :platform => ['el', 'ubuntu', 'sles'])
 
 if ENV['GIT_PROVIDER'] == 'shellgit'
   skip_test('Skipping test because removing Git from the system affects other "shellgit" tests.')
-elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 
@@ -86,7 +86,7 @@ step 'Remove "git" Package from System'
 if master_platform == 'RedHat'
   on(master, 'yum remove -y git')
 elsif master_platform == 'Debian'
-  if fact_on(master, "operatingsystemmajrelease") == '10.04'
+  if fact_on(master, "os.release.major") == '10.04'
     on(master, 'apt-get remove -y git-core')
   else
     on(master, 'apt-get remove -y git')

data/integration/tests/command_line/deploy_env_without_mod_update.rb

@@ -46,9 +46,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Inject New "site.pp" to the "production" Environment'
 inject_site_pp(master, site_pp_path, site_pp)
 

data/integration/tests/command_line/negative/neg_deploy_env_with_module_update.rb

@@ -47,9 +47,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Inject New "site.pp" to the "production" Environment'
 inject_site_pp(master, site_pp_path, site_pp)
 

data/integration/tests/git_source/HTTP_proxy_and_git_source.rb

@@ -16,28 +16,24 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 puppetfile =<<-EOS
 mod 'motd',
-  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd', :branch => 'main'
 EOS
 
-proxy_env_value = 'http://cattastic.net:3219'
-
 #In-line files
 r10k_conf = <<-CONF
 cachedir: '/var/cache/r10k'
 git:
   provider: '#{git_provider}'
   repositories:
-    - remote: 'http://example.com/fake_git_source.git'
+    - remote: 'https://something.else/repo'
       proxy: 'http://foooooooo.unresolvable:3128'
 sources:
   control:
     basedir: "#{env_path}"
-    remote: "http://example.com/fake_git_source.git"
+    remote: 'https://something.else/repo'
 CONF
 
 teardown do
-  master.clear_env_var('HTTP_PROXY')
-
   step 'Restore Original "r10k" Config'
   on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
 
@@ -45,8 +41,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-master.add_env_var('HTTP_PROXY', proxy_env_value)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 
@@ -64,7 +58,8 @@ git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_pat
 
 #test
 on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
-  regex = /proxy.*foooooooo\.unresolvable/
+  # Rugged as of 0.28 has a different error message than shellgit
+  regex = /((failed to resolve address for)|(Could not resolve proxy:)) foooooooo\.unresolvable/
   assert(r.exit_code == 1, 'expected error code was not observed')
   assert_match(regex, r.stderr, 'The expected error message was not observed' )
 end

data/integration/tests/git_source/git_source_git.rb

@@ -5,7 +5,7 @@ test_name 'CODEMGMT-92 - C59235 - Single Git Source Using "GIT" Transport Protoc
 
 confine(:to, :platform => 'el')
 
-if fact_on(master, "operatingsystemmajrelease").to_i < 6
+if fact_on(master, "os.release.major").to_i < 6 || fact_on(master, "os.release.major").to_i > 8
   skip_test('This version of EL is not supported by this test case!')
 end
 
@@ -84,9 +84,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/git_source/git_source_repeated_remote.rb

@@ -44,9 +44,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb

@@ -68,6 +68,6 @@ on(master, "chmod 600 #{ssh_private_key_path}")
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, "#{r10k_fqp} deploy environment -v", :acceptable_exit_codes => 1) do |result|
+on(master, "SSH_AUTH_SOCK= SSH_CONNECTION= SSH_CLIENT= #{r10k_fqp} deploy environment -v", :acceptable_exit_codes => 1) do |result|
   assert_match(error_message_regex, result.stderr, 'Expected message not found!')
 end

data/integration/tests/purging/content_not_purged_at_root.rb

@@ -50,9 +50,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/purging/default_purging.rb

@@ -51,9 +51,6 @@ fake_file_b_to_be_left_alone = "#{fake_environment_path_b}/fakefile2.txt"
 fake_file_c_to_be_purged     = "#{fake_environment_path_c}/fakefile3.txt"
 
 # initalize file content
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/purging/does_not_purge_files_on_white_list.rb

@@ -26,9 +26,6 @@ teardown do
 end
 
 # initalize file content
-step 'Stub the forge'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb

@@ -62,9 +62,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 env_names.each do |env|
   if env == 'production'
     step "Checkout \"#{env}\" Branch"

data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb

@@ -66,9 +66,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 env_names.each do |env|
   if env == 'production'
     step "Checkout \"#{env}\" Branch"

data/integration/tests/user_scenario/basic_workflow/multi_source_custom_forge_git_module.rb

@@ -102,9 +102,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
 

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_forge_module.rb

@@ -29,9 +29,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb

@@ -2,7 +2,7 @@ require 'git_utils'
 require 'r10k_utils'
 test_name 'CODEMGMT-86 - C59265 - Attempt to Deploy Environment to Disk with Insufficient Free Space'
 
-if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 

data/integration/tests/user_scenario/basic_workflow/negative/neg_duplicate_module_names.rb

@@ -25,9 +25,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/negative/neg_inaccessible_forge.rb

@@ -19,7 +19,7 @@ PUPPETFILE
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')
 
 #Verification
-error_message_regex = /Error: Could not connect via HTTPS to https:\/\/forgeapi.puppetlabs.com/
+error_message_regex = /Error: Could not connect via HTTPS to https:\/\/forgeapi.puppet(labs)?.com/
 
 #Teardown
 teardown do
@@ -34,7 +34,8 @@ step 'Backup "/etc/hosts" File on Master'
 on(master, "mv #{hosts_file_path} #{hosts_file_path}.bak")
 
 step 'Point Forge Hostname to Localhost'
-on(master, "echo '127.0.0.1  forgeapi.puppetlabs.com' > #{hosts_file_path}")
+on(master, "echo '127.0.0.1  forgeapi.puppet.com' > #{hosts_file_path}")
+on(master, "echo '127.0.0.1  forgeapi.puppetlabs.com' >> #{hosts_file_path}")
 
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

data/integration/tests/user_scenario/basic_workflow/negative/neg_specify_deleted_forge_module.rb

@@ -10,7 +10,7 @@ last_commit = git_last_commit(master, git_environments_path)
 r10k_fqp = get_r10k_fqp(master)
 
 #Verification
-error_notification_regex = /The module puppetlabs-regret does not appear to have any published releases/
+error_notification_regex = /(The module puppetlabs-regret does not appear to have any published releases)|(module puppetlabs-regret does not exist on)/
 
 #File
 puppet_file = <<-PUPPETFILE
@@ -24,10 +24,6 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-#Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 #Tests
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

data/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb

@@ -3,7 +3,7 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-62 - C59239 - Single Environment with 10,000 Files'
 
-if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 

data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_git_module.rb

@@ -64,9 +64,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_module.rb

@@ -45,9 +45,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb

@@ -3,7 +3,7 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-62 - C59242 - Single Environment with Large Binary Files'
 
-if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+if fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 

data/integration/tests/user_scenario/basic_workflow/single_env_module_already_installed.rb

@@ -44,9 +44,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Add motd module from the forge using the PMT'
 on(master, puppet('module', 'install', 'puppetlabs-motd', '--modulepath', forge_module_path))
 

data/integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb

@@ -43,9 +43,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_remote_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb

@@ -57,9 +57,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/basic_workflow/single_env_upgrade_forge_mod_revert_change.rb

@@ -60,9 +60,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)
 

data/integration/tests/user_scenario/complex_workflow/multi_env_add_change_remove.rb

@@ -65,9 +65,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 initial_env_names.each do |env|
   if env == 'production'
     step "Checkout \"#{env}\" Branch"