Merge pull request #1351 from justinstoller/PE-36512-prod-forge

(PE-36512) Move testing to production forge
puppetlabs · Jul 25, 2023 · d1ea09e · d1ea09e
2 parents 59258bf + cbcd985
commit d1ea09e
Show file tree

Hide file tree

Showing 31 changed files with 8 additions and 467 deletions.
diff --git a/integration/pre-suite/10_git_config.rb b/integration/pre-suite/10_git_config.rb
@@ -23,9 +23,6 @@
 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 = ';'

diff --git a/integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb b/integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
@@ -65,11 +65,7 @@
 #test
 on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
   # Rugged as of 0.28 has a different error message than shellgit
-  regex = if git_provider == 'rugged'
-            /failed to resolve address for ferritsarebest\.net/
-          else
-            /Could not resolve proxy: ferritsarebest\.net/
-          end
+  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
diff --git a/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb b/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
diff --git a/integration/tests/basic_functionality/proxy_specified_in_configuration.rb b/integration/tests/basic_functionality/proxy_specified_in_configuration.rb
@@ -50,7 +50,7 @@
 CONF
 
 #Verification
-squid_log_regex = /CONNECT forgeapi.puppet.com:443/
+squid_log_regex = /CONNECT forgeapi.puppet(labs)?.com:443/
 
 #Teardown
 teardown do

diff --git a/integration/tests/basic_functionality/proxy_with_pe_only_module.rb b/integration/tests/basic_functionality/proxy_with_pe_only_module.rb
diff --git a/integration/tests/basic_functionality/proxy_with_puppetfile.rb b/integration/tests/basic_functionality/proxy_with_puppetfile.rb
@@ -21,7 +21,7 @@
 squid_log = "/var/log/squid/access.log"
 
 #Verification
-squid_log_regex = /CONNECT forgeapi.puppet.com:443/
+squid_log_regex = /CONNECT forgeapi.puppet(labs)?.com:443/
 
 #Teardown
 teardown do

diff --git a/integration/tests/command_line/deploy_env_without_mod_update.rb b/integration/tests/command_line/deploy_env_without_mod_update.rb
@@ -46,9 +46,6 @@ class { 'motd':
 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)
 

diff --git a/integration/tests/command_line/negative/neg_deploy_env_with_module_update.rb b/integration/tests/command_line/negative/neg_deploy_env_with_module_update.rb
@@ -47,9 +47,6 @@ class { 'motd':
 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)
 

diff --git a/integration/tests/git_source/HTTP_proxy_and_git_source.rb b/integration/tests/git_source/HTTP_proxy_and_git_source.rb
@@ -59,11 +59,7 @@
 #test
 on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
   # Rugged as of 0.28 has a different error message than shellgit
-  regex = if git_provider == 'rugged'
-            /failed to resolve address for foooooooo\.unresolvable/
-          else
-            /Could not resolve proxy: foooooooo\.unresolvable/
-          end
+  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
diff --git a/integration/tests/git_source/git_source_repeated_remote.rb b/integration/tests/git_source/git_source_repeated_remote.rb
@@ -44,9 +44,6 @@
   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}")
 

diff --git a/integration/tests/purging/content_not_purged_at_root.rb b/integration/tests/purging/content_not_purged_at_root.rb
@@ -50,9 +50,6 @@
   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}")
 

diff --git a/integration/tests/purging/default_purging.rb b/integration/tests/purging/default_purging.rb
@@ -51,9 +51,6 @@
 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}")
 

diff --git a/integration/tests/purging/does_not_purge_files_on_white_list.rb b/integration/tests/purging/does_not_purge_files_on_white_list.rb
@@ -26,9 +26,6 @@
 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}")
 

diff --git a/integration/tests/purging/invalid_whitelist_types.rb b/integration/tests/purging/invalid_whitelist_types.rb