r10k 2.0.3 → 2.1.0

data/integration/test_run_scripts/all_tests-shellgit-pe-centos6.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
   cd ../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/all_tests-shellgit-pe-rhel7.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
   cd ../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/all_tests-shellgit-pe-sles11.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
   cd ../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1204.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
   cd ../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1404.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
   cd ../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/basic_functionality/all_tests-pe-centos6.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "basic_functionality" ]; then
   cd ../../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/command_line/all_tests-pe-centos6.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "command_line" ]; then
   cd ../../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/git_source/all_tests-pe-centos6.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "git_source" ]; then
   cd ../../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/user_scenario/basic_workflow/all_tests-pe-centos6.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "basic_workflow" ]; then
   cd ../../../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/test_run_scripts/user_scenario/complex_workflow/all_tests-pe-centos6.sh

@@ -7,7 +7,7 @@ if [ $SCRIPT_BASE_PATH = "complex_workflow" ]; then
   cd ../../../
 fi
 
-export pe_dist_dir=http://neptune.puppetlabs.lan/3.8/ci-ready/
+export pe_dist_dir=http://neptune.puppetlabs.lan/2015.2/ci-ready/
 export GIT_PROVIDER=shellgit
 
 beaker \

data/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb

@@ -0,0 +1,83 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-158 - C92362 - Install a PE-only module from forge'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include peonly')
+
+# Verification
+notify_message_regex = /I am in the production environment, this is a PE only module/
+
+#Teardown
+teardown do
+  step 'remove license file'
+  on(master, 'rm -f /etc/puppetlabs/license.key')
+
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup a Valid "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Download license file from int-resources'
+curl_on(master, 'http://int-resources.ops.puppetlabs.net/QA_resources/r10k/license.key -o /etc/puppetlabs/license.key')
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "ztr-peonly"')
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+agents.each do |agent|
+  step "Run Puppet Agent"
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
+  end
+end

data/integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb

@@ -0,0 +1,71 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-158 - C92361 - Attempt to install a PE-only module with no license file'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include peonly')
+
+# Verification
+error_message_regex = /You must have a valid Puppet Enterprise license on this node in order to download ztr-peonly/
+
+#Teardown
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup a Valid "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "ztr-peonly"')
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#Test
+step 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -p", :acceptable_exit_codes => [0,1]) do |result|
+  assert_match(error_message_regex, result.stderr, 'Expected error message was not observed!')
+end

data/integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb

@@ -8,6 +8,7 @@ env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 git_repo_path = '/git_repos'
 git_control_remote = File.join(git_repo_path, 'environments.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"
@@ -24,7 +25,11 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ERROR.*can\'t\ convert\ nil\ into\ String/
+if get_puppet_version(master) < 4.0
+  error_message_regex = /ERROR.*can\'t\ convert\ nil\ into\ String/
+else
+  error_message_regex = /ERROR.* -> no implicit conversion of nil into String/
+end
 
 #Teardown
 teardown do
@@ -41,6 +46,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/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb

@@ -6,9 +6,10 @@ test_name 'CODEMGMT-84 - C59270 - Attempt to Deploy with Missing r10k Configurat
 #Init
 r10k_config_path = get_r10k_config_file_path(master)
 r10k_config_bak_path = "#{r10k_config_path}.bak"
+r10k_fqp = get_r10k_fqp(master)
 
 #Verification
-error_message_regex = /Error while running.*R10K\:\:Deployment.*No configuration file given/
+error_message_regex = /No configuration file given, no config file found in current directory, and no global config present/
 
 #Teardown
 teardown do
@@ -22,6 +23,6 @@ on(master, "mv #{r10k_config_path} #{r10k_config_bak_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 => 8) do |result|
   assert_match(error_message_regex, result.stderr, 'Expected message not found!')
 end

data/integration/tests/basic_functionality/negative/neg_invalid_git_provider.rb

@@ -6,6 +6,7 @@ env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 git_repo_path = '/git_repos'
 git_control_remote = File.join(git_repo_path, 'environments.git')
 git_provider = 'invalid'
+r10k_fqp = get_r10k_fqp(master)
 
 r10k_config_path = get_r10k_config_file_path(master)
 r10k_config_bak_path = "#{r10k_config_path}.bak"
@@ -22,7 +23,7 @@ sources:
 CONF
 
 #Verification
-error_message_regex = /ConfigError:.*Couldn't load config file/
+error_message_regex = /should be one of.*not .invalid./
 
 #Teardown
 teardown do
@@ -39,6 +40,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 => 8) do |result|
   assert_match(error_message_regex, result.stderr, 'Expected message not found!')
 end

data/integration/tests/basic_functionality/negative/negative_bad_proxy.rb

@@ -0,0 +1,56 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-110 - C88671 - Specify a bad proxy to r10k'
+
+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"
+
+#Verification
+error_regex = /Unable to connect to.*getaddrinfo: Name or service not known/i
+
+#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://notarealhostname:3128')
+end
+
+step 'Install and configure squid proxy'
+on(master, install_squid)
+master.add_env_var('http_proxy', "http://notarealhostname: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", {:acceptable_exit_codes => [0,1,2]}) do |result|
+  assert_match(error_regex, result.stderr, 'Did not see the expected error')
+end

data/integration/tests/basic_functionality/proxy_specified_in_configuration.rb

@@ -0,0 +1,103 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-110 - C87652 - Specify the proxy in the r10k.yaml'
+
+confine(:to, :platform => ['el', 'sles'])
+
+#Init
+master_platform = fact_on(master, 'osfamily')
+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'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER']
+
+local_files_root_path = ENV['FILES'] || 'files'
+
+git_manifest_template_path = File.join(local_files_root_path, 'pre-suite', 'git_config.pp.erb')
+git_manifest = ERB.new(File.read(git_manifest_template_path)).result(binding)
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+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"
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+forge:
+  proxy: "http://#{master.hostname}:3128"
+CONF
+
+#Verification
+squid_log_regex = /CONNECT forgeapi.puppetlabs.com:443/
+
+#Teardown
+teardown do
+  step 'Restore "git" Package'
+  on(master, puppet('apply'), :stdin => git_manifest, :acceptable_exit_codes => [0,2])
+
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+
+  step 'Remove Squid'
+  on(master, puppet("apply -e 'service {'squid' : ensure => stopped}'"))
+  on(master, remove_squid)
+end
+
+#Setup
+step 'Backup Current "r10k" Config'
+on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
+
+step 'Update the "r10k" Config'
+create_remote_file(master, r10k_config_path, r10k_conf)
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "puppetlabs/motd"')
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+step 'Install and configure squid proxy'
+on(master, install_squid)
+
+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 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -p")
+
+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
+