r10k 1.4.2 → 1.5.1

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

@@ -0,0 +1,92 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-73 - C63184 - Single Environment Purge Unmanaged Modules'
+
+#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)
+
+#Verification
+motd_path = '/etc/motd'
+motd_contents = 'Hello!'
+motd_contents_regex = /\A#{motd_contents}\z/
+
+error_message_regex = /Blah/
+
+#File
+puppet_file = <<-PUPPETFILE
+mod "puppetlabs/xinetd"
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+
+#Manifest
+manifest = <<-MANIFEST
+  class { 'motd':
+    content => '#{motd_contents}',
+  }
+MANIFEST
+
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, manifest)
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+
+  step 'Remove "/etc/motd" File'
+  on(agents, "rm -rf #{motd_path}")
+end
+
+#Setup
+step 'Stub Forge on Master'
+stub_forge_on(master)
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Manually Install the "motd" Module from the Forge'
+on(master, puppet('module install puppetlabs-motd'))
+
+step 'Create "Puppetfile" for the "production" Environment'
+create_remote_file(master, puppet_file_path, puppet_file)
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_environments_path)
+
+#Tests
+step 'Deploy Environments via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+step 'Plug-in Sync Agents'
+on(agents, puppet("plugin download --server #{master}"))
+
+agents.each do |agent|
+  step 'Run Puppet Agent Against "production" Environment'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+  end
+
+  step "Verify MOTD Contents"
+  on(agent, "cat #{motd_path}") do |result|
+    assert_match(motd_contents_regex, result.stdout, 'File content is invalid!')
+  end
+end
+
+step 'Use r10k to Purge Unmanaged Modules'
+on(master, 'r10k puppetfile purge -v', :acceptable_exit_codes => 1)
+
+#Agent will fail because r10k will purge the "motd" module
+agents.each do |agent|
+  step 'Attempt to Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 0) do |result|
+    expect_failure('Expected to fail due to CODEMGMT-78') do
+      assert_match(error_message_regex, result.stderr, 'Expected error was not detected!')
+    end
+  end
+end

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

@@ -0,0 +1,116 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-111 - C63600 - Single Environment Switch Between Forge and Git for Puppetfile Module'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+prod_env_modules_path = File.join(env_path, 'production', 'modules')
+
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+
+#Verification
+motd_path = '/etc/motd'
+motd_template_path = File.join(prod_env_modules_path, 'motd', 'templates', 'motd.erb')
+motd_template_contents_forge = 'Hello!'
+motd_contents_git = 'Bonjour!'
+motd_contents_forge_regex = /\A#{motd_template_contents_forge}\n\z/
+motd_contents_git_regex = /\A#{motd_contents_git}\z/
+
+#File
+puppet_file_forge = <<-PUPPETFILE
+mod "puppetlabs/motd", '1.1.1'
+PUPPETFILE
+
+puppet_file_git = <<-PUPPETFILE
+mod "puppetlabs/motd",
+  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
+  :tag => '1.2.0'
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+
+#Manifest
+manifest_forge = <<-MANIFEST
+  include motd
+MANIFEST
+
+manifest_git = <<-MANIFEST
+  class { 'motd':
+    content => '#{motd_contents_git}',
+  }
+MANIFEST
+
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp_forge = create_site_pp(master_certname, manifest_forge)
+site_pp_git = create_site_pp(master_certname, manifest_git)
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+
+  step 'Remove "/etc/motd" File'
+  on(agents, "rm -rf #{motd_path}")
+end
+
+#Setup
+step 'Stub Forge on Master'
+stub_forge_on(master)
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp_forge)
+
+step 'Create "Puppetfile" for the "production" Environment'
+create_remote_file(master, puppet_file_path, puppet_file_forge)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and add modules.', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+step 'Update MOTD Template'
+create_remote_file(master, motd_template_path, motd_template_contents_forge)
+on(master, "chmod 644 #{motd_template_path}")
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+  end
+
+  step 'Verify MOTD Contents for Forge Version of Module'
+  on(agent, "cat #{motd_path}") do |result|
+    assert_match(motd_contents_forge_regex, result.stdout, 'File content is invalid!')
+  end
+end
+
+step 'Update "Puppetfile" to use Git for MOTD Module'
+create_remote_file(master, puppet_file_path, puppet_file_git)
+
+step 'Update "site.pp" in the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp_git)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and Puppetfile.', git_environments_path)
+
+step 'Deploy "production" Environment Again via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+  end
+
+  step 'Verify MOTD Contents for Git Version of Module'
+  on(agent, "cat #{motd_path}") do |result|
+    assert_match(motd_contents_git_regex, result.stdout, 'File content is invalid!')
+  end
+end

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

@@ -0,0 +1,59 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-62 - C59260 - Single Environment with Unicode File Paths'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip
+prod_env_modules_path = File.join(environment_path, 'production', 'modules')
+
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+local_files_root_path = ENV['FILES'] || 'files'
+
+unicode_module_path = File.join(local_files_root_path, 'modules', 'unicode')
+unicode_remote_original_file_path = File.join(git_environments_path, 'modules', 'unicode', 'files', 'pretend_unicode')
+unicode_remote_rename_file_path = File.join(git_environments_path, 'modules', 'unicode', 'files', "\uAD62\uCC63\uC0C3\uBEE7\uBE23\uB7E9\uC715\uCEFE\uBF90\uAE69")
+
+#Verification
+unicode_file_contents_regex = /\AHa ha ha! I am in Korean!\n\z/
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include unicode')
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Copy "unicode" Module to "production" Environment Git Repo'
+scp_to(master, unicode_module_path, File.join(git_environments_path, 'modules'))
+
+#Required because of CODEMGMT-87
+step 'Rename File to Actual Unicode'
+on(master, "mv #{unicode_remote_original_file_path} #{unicode_remote_rename_file_path}".force_encoding('BINARY'))
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and add modules.', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, 'r10k deploy environment -v')
+
+#Note: Usually a full Puppet Run would be performed for verification.
+#Since Puppet has problems with Unicode, this test will verify the file
+#directly in the r10k environment.
+
+step 'Verify Unicode File'
+on(master, "cat #{unicode_remote_rename_file_path}") do |result|
+  assert_match(unicode_file_contents_regex, result.stdout, 'File content is invalid!')
+end

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

@@ -0,0 +1,165 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-117 - C63602- Single Environment Upgrade Forge Module then Revert Change'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+prod_env_modules_path = File.join(env_path, 'production', 'modules')
+
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+
+#Verification
+motd_path = '/etc/motd'
+motd_template_path = File.join(prod_env_modules_path, 'motd', 'templates', 'motd.erb')
+motd_template_contents = 'Hello!'
+motd_new_contents = 'Yolo!'
+motd_contents_old_regex = /\A#{motd_template_contents}\n\z/
+motd_contents_new_regex = /\A#{motd_new_contents}\z/
+
+motd_old_version = /"*1.1.1*"/
+motd_new_version = /"*1.2.0*"/
+motd_version_file_path = File.join(prod_env_modules_path, 'motd', 'metadata.json')
+
+#File
+puppet_file_old_motd = <<-PUPPETFILE
+mod "puppetlabs/motd", '1.1.1'
+PUPPETFILE
+
+puppet_file_new_motd = <<-PUPPETFILE
+mod "puppetlabs/motd", '1.2.0'
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+puppet_file_path_bak = "#{puppet_file_path}.bak"
+
+#Manifest
+manifest_old = <<-MANIFEST
+  include motd
+MANIFEST
+
+manifest_new = <<-MANIFEST
+  class { 'motd':
+    content => '#{motd_new_contents}',
+  }
+MANIFEST
+
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp_old = create_site_pp(master_certname, manifest_old)
+site_pp_new = create_site_pp(master_certname, manifest_new)
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+
+  step 'Remove "/etc/motd" File'
+  on(agents, "rm -rf #{motd_path}")
+end
+
+#Setup
+step 'Stub Forge on Master'
+stub_forge_on(master)
+
+step 'Checkout "production" Branch'
+git_on(master, 'checkout production', git_environments_path)
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp_old)
+
+step 'Create "Puppetfile" for the "production" Environment'
+create_remote_file(master, puppet_file_path, puppet_file_old_motd)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and add modules.', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+step 'Update MOTD Template'
+create_remote_file(master, motd_template_path, motd_template_contents)
+on(master, "chmod 644 #{motd_template_path}")
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+  end
+
+  step 'Verify MOTD Contents for Forge Version of Module'
+  on(agent, "cat #{motd_path}") do |result|
+    assert_match(motd_contents_old_regex, result.stdout, 'File content is invalid!')
+  end
+
+  step 'Verify Version 1.1.1 of the MOTD Module'
+  on(master, "grep version #{motd_version_file_path}") do |result|
+    assert_match(motd_old_version, result.stdout, 'File content is invalid!')
+  end
+end
+
+step 'Backup Old MOTD "Puppetfile" to allow for creation of New MOTD "Puppetfile"'
+on(master, "mv #{puppet_file_path} #{puppet_file_path_bak}")
+
+step 'Update "Puppetfile" to use New Module Version 1.2.0'
+create_remote_file(master, puppet_file_path, puppet_file_new_motd)
+
+step 'Update "site.pp" in the "production" Environment to New Style Manifest'
+inject_site_pp(master, site_pp_path, site_pp_new)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and Puppetfile.', git_environments_path)
+
+step 'Deploy "production" Environment Again via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+  end
+
+  step 'Verify MOTD Contents for New Version of Module'
+  on(agent, "cat #{motd_path}") do |result|
+    assert_match(motd_contents_new_regex, result.stdout, 'File content is invalid!')
+  end
+
+  step 'Verify Version 1.2.0 of the MOTD Module'
+  on(master, "grep version #{motd_version_file_path}") do |result|
+    assert_match(motd_new_version, result.stdout, 'File content is invalid!')
+  end
+end
+
+step 'Restore Old MOTD "Puppetfile"'
+on(master, "mv #{puppet_file_path_bak} #{puppet_file_path}")
+
+step 'Revert "site.pp" in the "production" Environment to Old Style Manifest'
+inject_site_pp(master, site_pp_path, site_pp_old)
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'Update site.pp and add modules.', git_environments_path)
+
+step 'Deploy "production" Environment Again via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+step 'Update MOTD Template'
+create_remote_file(master, motd_template_path, motd_template_contents)
+on(master, "chmod 644 #{motd_template_path}")
+
+agents.each do |agent|
+  step 'Run Puppet Agent'
+  on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+  end
+
+  step 'Verify MOTD Contents for Old Version of Module'
+  on(agent, "cat #{motd_path}") do |result|
+    assert_match(motd_contents_old_regex, result.stdout, 'File content is invalid!')
+  end
+
+  step 'Verify Version 1.1.1 of the MOTD Module'
+  on(master, "grep version #{motd_version_file_path}") do |result|
+    assert_match(motd_old_version, result.stdout, 'File content is invalid!')
+  end
+end

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

@@ -0,0 +1,162 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-48 - C59262 - Multiple Environments with Additions, Changes and Removal of Branches'
+
+#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)
+local_files_root_path = ENV['FILES'] || 'files'
+helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
+
+initial_env_names = ['production', 'stage', 'test']
+
+#Verification for "production" Environment
+motd_path = '/etc/motd'
+motd_contents = 'Hello!'
+motd_contents_regex = /\A#{motd_contents}\z/
+prod_env_notify_message_regex = /I am in the production environment/
+
+#Verification for "stage" Environment
+stage_env_notify_message = 'This is a different message'
+stage_env_notify_message_regex = /#{stage_env_notify_message}/
+
+#Verification for "test" Environment
+test_env_error_message_regex = /Error:.*Could not find environment 'test'/
+
+#Verification for "temp" Environment
+test_env_notify_message_regex = /I am in the temp environment/
+
+#Manifest
+prod_env_motd_manifest = <<-MANIFEST
+  class { 'helloworld': }
+  class { 'motd':
+    content => '#{motd_contents}',
+  }
+MANIFEST
+
+stage_env_custom_mod_manifest = <<-MANIFEST
+  class helloworld {
+    notify { "Hello world!":
+      message => "#{stage_env_notify_message}"
+    }
+  }
+MANIFEST
+
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+original_site_pp = create_site_pp(master_certname, '  include helloworld')
+prod_env_motd_site_pp = create_site_pp(master_certname, prod_env_motd_manifest)
+
+#File
+puppet_file = <<-PUPPETFILE
+mod "puppetlabs/motd"
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+
+  step 'Remove "/etc/motd" File'
+  on(agents, "rm -rf #{motd_path}")
+end
+
+#Setup
+step 'Stub Forge on Master'
+stub_forge_on(master)
+
+initial_env_names.each do |env|
+  if env == 'production'
+    step "Checkout \"#{env}\" Branch"
+    git_on(master, "checkout #{env}", git_environments_path)
+
+    step "Copy \"helloworld\" Module to \"#{env}\" Environment Git Repo"
+    scp_to(master, helloworld_module_path, File.join(git_environments_path, "site", 'helloworld'))
+
+    step "Inject New \"site.pp\" to the \"#{env}\" Environment"
+    inject_site_pp(master, site_pp_path, original_site_pp)
+
+    step "Push Changes to \"#{env}\" Environment"
+    git_add_commit_push(master, env, 'Update site.pp and add module.', git_environments_path)
+  else
+    step "Create \"#{env}\" Branch from \"production\""
+    git_on(master, 'checkout production', git_environments_path)
+    git_on(master, "checkout -b #{env}", git_environments_path)
+
+    step "Push Changes to \"#{env}\" Environment"
+    git_push(master, env, git_environments_path)
+  end
+end
+
+#Tests
+step 'Deploy Environments via r10k'
+on(master, 'r10k deploy environment -v')
+
+#Initial Verification
+initial_env_names.each do |env|
+  agents.each do |agent|
+    step "Run Puppet Agent Against \"#{env}\" Environment"
+    on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
+      assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+      assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
+    end
+  end
+end
+
+#Add, Change, Remove Environments
+step 'Create "temp" Branch from "production"'
+git_on(master, 'checkout production', git_environments_path)
+git_on(master, 'checkout -b temp', git_environments_path)
+git_push(master, 'temp', git_environments_path)
+
+step 'Add "puppetlabs-motd" Module to the "production" Environment'
+git_on(master, 'checkout production', git_environments_path)
+inject_site_pp(master, site_pp_path, prod_env_motd_site_pp)
+create_remote_file(master, puppet_file_path, puppet_file)
+git_add_commit_push(master, 'production', 'Add motd module.', git_environments_path)
+
+step 'Update Custom Module in the "stage" Environment'
+hw_init_pp_path = File.join(git_environments_path, 'site', 'helloworld', 'manifests', 'init.pp')
+git_on(master, 'checkout stage', git_environments_path)
+create_remote_file(master, hw_init_pp_path, stage_env_custom_mod_manifest)
+git_add_commit_push(master, 'stage', 'Update custom module.', git_environments_path)
+
+step 'Delete the "test" Environment'
+git_on(master, 'branch -D test', git_environments_path)
+git_on(master, 'push origin --delete test', git_environments_path)
+
+step 'Re-deploy Environments via r10k'
+on(master, 'r10k deploy environment -v -p')
+
+#Second Pass Verification
+agents.each do |agent|
+  step 'Run Puppet Agent Against "production" Environment'
+  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(prod_env_notify_message_regex, result.stdout, 'Expected message not found!')
+  end
+
+  step 'Run Puppet Agent Against "temp" Environment'
+  on(agent, puppet('agent', '--test', '--environment temp'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(test_env_notify_message_regex, result.stdout, 'Expected message not found!')
+  end
+
+  step "Verify MOTD Contents"
+  on(agent, "cat #{motd_path}") do |result|
+    assert_match(motd_contents_regex, result.stdout, 'File content is invalid!')
+  end
+
+  step 'Run Puppet Agent Against "stage" Environment'
+  on(agent, puppet('agent', '--test', '--environment stage'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(stage_env_notify_message_regex, result.stdout, 'Expected message not found!')
+  end
+
+  step 'Attempt to Run Puppet Agent Against "test" Environment'
+  on(agent, puppet('agent', '--test', '--environment test'), :acceptable_exit_codes => 1) do |result|
+    assert_match(test_env_error_message_regex, result.stderr, 'Expected error was not detected!')
+  end
+end