r10k 3.5.2

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

@@ -0,0 +1,163 @@
+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')
+r10k_fqp = get_r10k_fqp(master)
+
+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_fqp} 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_fqp} 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

data/integration/tests/user_scenario/complex_workflow/multi_env_remove_re-add.rb

@@ -0,0 +1,111 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-48 - C59263 - Multiple Environments with Adding, Removing and Re-adding Same Branch Name'
+
+#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')
+r10k_fqp = get_r10k_fqp(master)
+
+initial_env_names = ['production', 'stage']
+
+#Verification
+notify_message_regex = /I am in the production environment/
+stage_env_error_message_regex = /Error:.*Could not find environment 'stage'/
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include helloworld')
+
+#Teardown
+teardown do
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+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, 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_fqp} 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
+
+#Remove "stage" Environment
+step 'Delete the "stage" Environment'
+git_on(master, 'checkout production', git_environments_path)
+git_on(master, 'branch -D stage', git_environments_path)
+git_on(master, 'push origin --delete stage', git_environments_path)
+
+step 'Re-deploy Environments via r10k'
+on(master, "#{r10k_fqp} deploy environment -v")
+
+#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(notify_message_regex, result.stdout, 'Expected message not found!')
+  end
+
+  step 'Attempt to Run Puppet Agent Against "stage" Environment'
+  on(agent, puppet('agent', '--test', '--environment stage'), :acceptable_exit_codes => 1) do |result|
+    assert_match(stage_env_error_message_regex, result.stderr, 'Expected error was not detected!')
+  end
+end
+
+#Create the "stage" Environment Again
+step 'Create "stage" Branch from "production"'
+git_on(master, 'checkout production', git_environments_path)
+git_on(master, 'checkout -b stage', git_environments_path)
+
+step 'Push Changes to "stage" Environment'
+git_push(master, 'stage', git_environments_path)
+
+step 'Re-deploy Environments via r10k'
+on(master, "#{r10k_fqp} deploy environment -v")
+
+#Final 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

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

@@ -0,0 +1,78 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-155 - C62421 - Multiple Environments with Existing Unmanaged Environments'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip
+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')
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include helloworld')
+
+#Verification
+notify_message_prod_env_regex = /I am in the production environment/
+notify_message_test_env_regex = /I am in the test environment/
+removal_message_test_env_regex = /Removing unmanaged path.*test/
+error_message_regex = /Could not retrieve catalog from remote server/
+
+#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 "helloworld" Module to "production" Environment Git Repo'
+scp_to(master, helloworld_module_path, File.join(git_environments_path, "site", 'helloworld'))
+
+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 "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -v")
+
+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_prod_env_regex, result.stdout, 'Expected message not found!')
+  end
+end
+
+step 'Create Unmanaged "test" Environment'
+on(master, "cp -r #{environment_path}/production #{environment_path}/test")
+
+agents.each do |agent|
+  step 'Run Puppet Agent Against "test" Environment'
+  on(agent, puppet('agent', '--test', '--environment test'), :acceptable_exit_codes => 2) do |result|
+    assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+    assert_match(notify_message_test_env_regex, result.stdout, 'Expected message not found!')
+  end
+end
+
+step 'Re-deploy Environments via r10k'
+on(master, "#{r10k_fqp} deploy environment -v") do |result|
+  assert_match(removal_message_test_env_regex, result.output, 'Unexpected error was detected!')
+end
+
+agents.each do |agent|
+  step 'Run Puppet Agent Against "test" Environment'
+  on(agent, puppet('agent', '--test', '--environment test'), :acceptable_exit_codes => 1) do |result|
+    assert_match(error_message_regex, result.stderr, 'Expected message not found!')
+  end
+end

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

@@ -0,0 +1,100 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-155 - C64588 - Single Environment with Git Module Using a Branch Reference where Updates Occur After Initial Deploy'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+environment_path = on(master, puppet('config', 'print', 'environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+
+git_repo_parent_path = '/git_repos'
+git_repo_module_name = 'helloworld_module'
+git_remote_module_path = File.join(git_repo_parent_path, "#{git_repo_module_name}.git")
+git_module_clone_path = '/root/helloworld'
+
+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')
+
+#Verification
+notify_original_message_regex = /I am in the production environment/
+notify_updated_message = 'A totally different message'
+notify_updated_message_regex = /#{notify_updated_message}/
+
+#File
+puppet_file = <<-PUPPETFILE
+mod 'test/helloworld',
+  :git => '#{git_remote_module_path}',
+  :ref => 'master'
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+
+updated_helloworld_manifest = <<-MANIFEST
+class helloworld {
+  notify { "Hello world!": message => "#{notify_updated_message}"}
+}
+MANIFEST
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include helloworld')
+
+#Teardown
+teardown do
+  step 'Remove Git Repo and Clone for Module'
+  on(master, "rm -rf #{git_remote_module_path} #{git_module_clone_path}")
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Create Bare Git Repo and Clone'
+on(master, "mkdir -p #{git_remote_module_path} #{git_module_clone_path}")
+git_init_bare_repo_and_clone(master, git_repo_parent_path, git_repo_module_name, git_module_clone_path)
+
+step 'Copy "helloworld" Module to Git Repo'
+scp_to(master, "#{helloworld_module_path}/manifests", git_module_clone_path)
+
+step 'Push Changes for Module Git Repo to Remote'
+git_add_commit_push(master, 'master', 'Add module.', git_module_clone_path)
+
+step 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Create "Puppetfile" for the "production" Environment'
+create_remote_file(master, puppet_file_path, puppet_file)
+
+step 'Push Changes to Environments Git Repo Remote'
+git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_environments_path)
+
+#Tests
+step 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -v -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_original_message_regex, result.stdout, 'Expected message not found!')
+  end
+end
+
+step 'Update "helloworld" Module and Push Changes'
+create_remote_file(master, "#{git_module_clone_path}/manifests/init.pp", updated_helloworld_manifest)
+on(master, "chmod -R 644 #{git_module_clone_path}")
+git_add_commit_push(master, 'master', 'Update module.', git_module_clone_path)
+
+step 'Deploy "production" Environment Again via r10k'
+on(master, "#{r10k_fqp} deploy environment -v -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_updated_message_regex, result.stdout, 'Expected message not found!')
+  end
+end