r10k 2.0.3 → 2.1.0

data/integration/tests/basic_functionality/proxy_with_puppetfile.rb

@@ -0,0 +1,61 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-110 - C87651 - Specify a proxy in an environment variable'
+
+confine(:to, :platform => ['el', 'sles'])
+
+#Init
+master_platform = fact_on(master, 'osfamily')
+r10k_fqp = get_r10k_fqp(master)
+
+case master_platform
+  when 'RedHat'
+    pkg_manager = 'yum'
+  when 'Suse'
+    pkg_manager = 'zypper'
+end
+
+install_squid = "#{pkg_manager} install -y squid"
+remove_squid = "#{pkg_manager} remove -y squid"
+squid_log = "/var/log/squid/access.log"
+
+#Verification
+squid_log_regex = /CONNECT forgeapi.puppetlabs.com:443/
+
+#Teardown
+teardown do
+  step 'Remove puppetfile'
+  on(master, 'rm -rf modules/')
+  on(master, 'rm Puppetfile')
+
+  step 'Remove Squid'
+  on(master, puppet("apply -e 'service {'squid' : ensure => stopped}'"))
+  on(master, remove_squid)
+
+  step 'Remove proxy environment variable'
+  master.delete_env_var('http_proxy', "http://#{master.hostname}:3128")
+end
+
+step 'Install and configure squid proxy'
+on(master, install_squid)
+master.add_env_var('http_proxy', "http://#{master.hostname}:3128")
+
+step 'turn off the firewall'
+on(master, puppet("apply -e 'service {'iptables' : ensure => stopped}'"))
+
+step 'start squid proxy'
+on(master, puppet("apply -e 'service {'squid' : ensure => running}'"))
+
+#Tests
+step 'make a puppetfile'
+create_remote_file(master, "Puppetfile", 'mod "puppetlabs/motd"')
+
+step 'Use a r10k puppetfile'
+on(master, "#{r10k_fqp} puppetfile install")
+
+step 'Read the squid logs'
+on(master, "cat #{squid_log}") do |result|
+  assert_match(squid_log_regex, result.stdout, 'Proxy logs did not indicate use of the proxy.')
+end
+

data/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb

@@ -16,6 +16,7 @@ end
 master_platform = fact_on(master, 'osfamily')
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
 
 git_repo_path = '/git_repos'
 git_control_remote = 'git@github.com:puppetlabs/codemgmt-92.git'
@@ -95,7 +96,7 @@ end
 
 #Tests
 step 'Deploy "production" Environment via r10k'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 agents.each do |agent|
   step "Run Puppet Agent"

data/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb

@@ -16,6 +16,7 @@ end
 master_platform = fact_on(master, 'osfamily')
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
 
 git_repo_path = '/git_repos'
 git_repo_name = 'environments'
@@ -96,7 +97,7 @@ end
 
 #Tests
 step 'Deploy "production" Environment via r10k'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 agents.each do |agent|
   step "Run Puppet Agent"

data/integration/tests/command_line/deploy_env_without_mod_update.rb

@@ -7,6 +7,7 @@ test_name 'CODEMGMT-90 - C62419 - Deploy Environment without Module Update'
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip
 prod_env_path = File.join(environment_path, 'production')
+r10k_fqp = get_r10k_fqp(master)
 
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
@@ -58,14 +59,14 @@ step 'Push Changes'
 git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_environments_path)
 
 step 'Deploy "production" Environment via r10k with modules'
-on(master, 'r10k deploy environment -p -v')
+on(master, "#{r10k_fqp} deploy environment -p -v")
 
 step 'Corrupt MOTD Manifest'
 create_remote_file(master, motd_module_init_pp_path, 'Broken')
 
 #Tests
 step 'Deploy "production" Environment via r10k without module update'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 agents.each do |agent|
   step "Run Puppet Agent"

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

@@ -7,6 +7,7 @@ test_name 'CODEMGMT-90 - C62418 - Deploy Environment with Module Update'
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip
 prod_env_path = File.join(environment_path, 'production')
+r10k_fqp = get_r10k_fqp(master)
 
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
@@ -59,14 +60,14 @@ step 'Push Changes'
 git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_environments_path)
 
 step 'Deploy "production" Environment via r10k with modules'
-on(master, 'r10k deploy environment -p -v')
+on(master, "#{r10k_fqp} deploy environment -p -v")
 
 step 'Corrupt MOTD Manifest'
 create_remote_file(master, motd_module_init_pp_path, 'Broken')
 
 #Tests
 step 'Deploy "production" Environment via r10k with module update'
-on(master, 'r10k deploy environment -p -v')
+on(master, "#{r10k_fqp} deploy environment -p -v")
 
 agents.each do |agent|
   step "Run Puppet Agent"

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

@@ -6,6 +6,7 @@ test_name 'CODEMGMT-90 - C63461 - Specify Invalid Command-line Deployment Flag'
 #Init
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
 
 #Verification
 error_message_regex = /deploy: illegal option/
@@ -17,6 +18,6 @@ end
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy -w environment -v', :acceptable_exit_codes => 1) do |result|
+on(master, "#{r10k_fqp} deploy -w environment -v", :acceptable_exit_codes => 1) do |result|
   assert_match(error_message_regex, result.stderr, 'Expected message not found!')
 end

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

@@ -6,6 +6,7 @@ test_name 'CODEMGMT-90 - C63462 - Specify Invalid Command-line Environment Flag'
 #Init
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
 
 #Verification
 error_message_regex = /environment: illegal option/
@@ -17,6 +18,6 @@ end
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy environment -x', :acceptable_exit_codes => 1) do |result|
+on(master, "#{r10k_fqp} deploy environment -x", :acceptable_exit_codes => 1) do |result|
   assert_match(error_message_regex, result.stderr, 'Expected message not found!')
 end

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

@@ -6,6 +6,7 @@ test_name 'CODEMGMT-90 - C62420 - Invalid Command Line Argument'
 #Init
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
 
 #Verification
 error_message_regex = /error/
@@ -17,8 +18,6 @@ end
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy environment NONEXISTENTENV -v', :acceptable_exit_codes => [0, 1, 2]) do |result|
-  expect_failure('expected to fail due to RK-21') do
-    assert_match(/error/, result.stderr.downcase, 'Expected message not found!')
-  end
+on(master, "#{r10k_fqp} deploy environment NONEXISTENTENV -v", :acceptable_exit_codes => 1) do |result|
+  assert_match(/error/, result.stderr.downcase, 'Expected message not found!')
 end

data/integration/tests/git_source/git_source_git.rb

@@ -12,6 +12,7 @@ end
 #Init
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
 
 git_control_remote = 'git://localhost/environments.git'
 git_environments_path = '/root/environments'
@@ -93,7 +94,11 @@ step 'Update the "r10k" Config'
 create_remote_file(master, r10k_config_path, r10k_conf)
 
 step 'Install "puppetlabs-xinetd" Module'
-on(master, puppet('module install puppetlabs-xinetd --modulepath /opt/puppet/share/puppet/modules'))
+on(master, puppet('config print basemodulepath')) do |result|
+  (result.stdout.include? ':') ? separator = ':' : separator = ';'
+  @module_path = result.stdout.split(separator).first
+end
+on(master, puppet("module install puppetlabs-xinetd --modulepath #{@module_path}"))
 
 step 'Install and Configure "git-daemon" service'
 on(master, puppet('apply'), :stdin => git_daemon_xinetd_enable_manifest)
@@ -112,7 +117,7 @@ git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_
 
 #Tests
 step 'Deploy "production" Environment via r10k'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 agents.each do |agent|
   step "Run Puppet Agent"

data/integration/tests/git_source/git_source_ssh.rb

@@ -7,6 +7,7 @@ test_name 'CODEMGMT-92 - C59234 - Single Git Source Using "SSH" Transport Protoc
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 git_control_remote = 'git@github.com:puppetlabs/codemgmt-92.git'
 git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+r10k_fqp = get_r10k_fqp(master)
 
 jenkins_key_path = File.file?("#{ENV['HOME']}/.ssh/id_rsa") ? "#{ENV['HOME']}/.ssh/id_rsa" : File.expand_path('~/.ssh/id_rsa-jenkins')
 ssh_private_key_path = '/root/.ssh/id_rsa-jenkins'
@@ -49,7 +50,7 @@ teardown do
   on(master, "rm -rf #{ssh_config_path}")
 
   step 'Restore Original "production" Environment via r10k'
-  on(master, 'r10k deploy environment -v')
+  on(master, "#{r10k_fqp} deploy environment -v")
 end
 
 #Setup
@@ -73,7 +74,7 @@ on(master, "chmod 600 #{ssh_private_key_path}")
 
 #Tests
 step 'Deploy "production" Environment via r10k'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 agents.each do |agent|
   step "Run Puppet Agent"

data/integration/tests/git_source/git_source_submodule.rb

@@ -12,6 +12,7 @@ git_repo_module_path = File.join(git_repo_module_parent_path, "#{git_repo_module
 git_clone_module_path = '/root/helloworld_module'
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
 
 local_files_root_path = ENV['FILES'] || 'files'
 helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
@@ -56,7 +57,7 @@ git_add_commit_push(master, 'production', 'Update site.pp.', git_environments_pa
 
 #Tests
 step 'Deploy "production" Environment via r10k'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 agents.each do |agent|
   step "Run Puppet Agent"

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

@@ -8,6 +8,7 @@ test_name 'CODEMGMT-101 - C59261 - Attempt to Deploy Environment with Broken Git
 git_control_remote = '/git_repos/environments.git'
 prod_branch_head_ref_path = File.join(git_control_remote, 'refs', 'heads', 'production')
 prod_branch_head_ref_path_backup = '/tmp/production.bak'
+r10k_fqp = get_r10k_fqp(master)
 
 invalid_sha_ref = Digest::SHA1.hexdigest('broken')
 
@@ -30,7 +31,7 @@ on(master, "chmod 644 #{prod_branch_head_ref_path}")
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy environment -v -t', :acceptable_exit_codes => [0,1]) do |result|
+on(master, "#{r10k_fqp} deploy environment -v -t", :acceptable_exit_codes => [0,1]) do |result|
   expect_failure('Expected to fail due to RK-28') do
     assert_match(error_message_regex, result.stderr, 'Expected message not found!')
   end

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

@@ -7,6 +7,7 @@ test_name 'CODEMGMT-101 - C59236 - Attempt to Deploy Environment with Unauthoriz
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 git_control_remote = 'https://bad:user@github.com/puppetlabs/codemgmt-92.git'
 git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+r10k_fqp = get_r10k_fqp(master)
 
 r10k_config_path = get_r10k_config_file_path(master)
 r10k_config_bak_path = "#{r10k_config_path}.bak"
@@ -40,6 +41,6 @@ create_remote_file(master, r10k_config_path, r10k_conf)
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy environment -v', :acceptable_exit_codes => 1) do |result|
+on(master, "#{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/git_source/negative/neg_git_unauthorized_ssh.rb

@@ -8,6 +8,7 @@ test_name 'CODEMGMT-101 - C59237 - Attempt to Deploy Environment with Unauthoriz
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 git_control_remote = 'git@github.com:puppetlabs/codemgmt-92.git'
 git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+r10k_fqp = get_r10k_fqp(master)
 
 unauthorized_rsa_key = OpenSSL::PKey::RSA.new(2048)
 ssh_private_key_path = '/root/.ssh/unauthorized_key'
@@ -67,6 +68,6 @@ on(master, "chmod 600 #{ssh_private_key_path}")
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy environment -v', :acceptable_exit_codes => 1) do |result|
+on(master, "#{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/git_source/negative/neg_git_unicode_branch.rb

@@ -6,6 +6,7 @@ test_name 'CODEMGMT-101 - C59231 - Attempt to Deploy Environment from Git Source
 #Init
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
 
 unicode_env = "\uAD62\uCC63\uC0C3\uBEE7\uBE23\uB7E9\uC715\uCEFE\uBF90\uAE69"
 
@@ -27,7 +28,7 @@ git_push(master, unicode_env, git_environments_path)
 
 #Tests
 step 'Attempt to Deploy via r10k'
-on(master, 'r10k deploy environment -v -t', :acceptable_exit_codes => 0) do |result|
+on(master, "#{r10k_fqp} deploy environment -v -t", :acceptable_exit_codes => [0,1]) do |result|
   expect_failure('Expected to fail due to RK-29') do
     assert_match(error_message_regex, result.stderr, 'Expected message not found!')
   end

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

@@ -2,19 +2,19 @@ require 'securerandom'
 require 'git_utils'
 require 'r10k_utils'
 require 'master_manipulator'
-test_name 'CODEMGMT-62 - C59241 - Single Source with 1,000 Branches'
+test_name 'CODEMGMT-62 - C59241 - Single Source with 100 Branches'
 
 #Init
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 confdir_path = on(master, puppet('config', 'print', 'confdir')).stdout.rstrip
 modules_path = File.join(confdir_path, 'modules')
+r10k_fqp = get_r10k_fqp(master)
 
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
 local_files_root_path = ENV['FILES'] || 'files'
 helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
 
-#Because of CODEMGMT-64 we can only support 100 branches currently.
 env_names = (0 ... 100).to_a.map!{ |x| x > 0 ? SecureRandom.uuid.gsub(/-/,"") * 3 : 'production'}
 
 #Manifest
@@ -52,7 +52,7 @@ end
 
 #Tests
 step 'Deploy Environments via r10k'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 #Select three environments at random and verify results.
 env_names.sample(3).each do |env|

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

@@ -7,6 +7,7 @@ test_name 'CODEMGMT-73 - C59226 - Multiple Environments with Custom, Forge and G
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 confdir_path = on(master, puppet('config', 'print', 'confdir')).stdout.rstrip
 modules_path = File.join(confdir_path, 'modules')
+r10k_fqp = get_r10k_fqp(master)
 
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
@@ -91,7 +92,7 @@ end
 
 #Tests
 step 'Deploy Environments via r10k'
-on(master, 'r10k deploy environment -v -p')
+on(master, "#{r10k_fqp} deploy environment -v -p")
 
 env_names.each do |env|
   agents.each do |agent|

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

@@ -5,8 +5,12 @@ test_name 'CODEMGMT-40 - C59223 - Multiple Environments with Custom, Forge and G
 
 #Init
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
-confdir_path = on(master, puppet('config', 'print', 'confdir')).stdout.rstrip
-modules_path = File.join(confdir_path, 'modules')
+r10k_fqp = get_r10k_fqp(master)
+step 'Read module path'
+on(master, puppet('config print basemodulepath')) do |result|
+  (result.stdout.include? ':') ? separator = ':' : separator = ';'
+  @module_path = result.stdout.split(separator).first
+end
 
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
@@ -24,7 +28,7 @@ stdlib_notify_message_regex = /The test message is:.*one.*=>.*1.*two.*=>.*bats.*
 
 #File
 puppet_file = <<-PUPPETFILE
-moduledir '#{modules_path}'
+moduledir '#{@module_path}'
 mod "puppetlabs/motd"
 mod 'puppetlabs/stdlib',
   :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
@@ -57,7 +61,7 @@ teardown do
   on(agents, "rm -rf #{motd_path}")
 
   step 'Remove Static Modules'
-  on(agents, "rm -rf #{modules_path}/*")
+  on(agents, "rm -rf #{@module_path}/*")
 end
 
 #Setup
@@ -94,7 +98,7 @@ git_add_commit_push(master, 'production', 'Add module.', git_environments_path)
 
 #Tests
 step 'Deploy Environments via r10k'
-on(master, 'r10k deploy environment -v -p')
+on(master, "#{r10k_fqp} deploy environment -v -p")
 
 env_names.each do |env|
   agents.each do |agent|

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

@@ -3,18 +3,25 @@ require 'r10k_utils'
 require 'master_manipulator'
 test_name 'CODEMGMT-102 - C63192 - Multiple Environments with Hiera Data'
 
+skip_test('This test is blocked by RK-136')
+
 #Init
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 
 git_environments_path = '/root/environments'
 last_commit = git_last_commit(master, git_environments_path)
+r10k_fqp = get_r10k_fqp(master)
 
 local_files_root_path = ENV['FILES'] || 'files'
 hieratest_module_path = File.join(local_files_root_path, 'modules', 'hieratest')
 
 hiera_local_config_path = File.join(local_files_root_path, 'hiera.yaml')
 hiera_master_config_path = on(master, puppet('config', 'print', 'hiera_config')).stdout.rstrip
-hiera_data_dir = File.join(git_environments_path, 'hiera')
+if get_puppet_version(master) < 4.0
+  hiera_data_dir = File.join(git_environments_path, 'hiera')
+else
+  hiera_data_dir = File.join(git_environments_path, 'hieradata')
+end
 
 site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
 site_pp = create_site_pp(master_certname, '  include hieratest')
@@ -80,7 +87,7 @@ restart_puppet_server(master)
 
 #Tests
 step 'Deploy Environments via r10k'
-on(master, 'r10k deploy environment -v')
+on(master, "#{r10k_fqp} deploy environment -v")
 
 env_names.each do |env|
   agents.each do |agent|