r10k 3.5.2

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

@@ -0,0 +1,66 @@
+require 'securerandom'
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+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')
+
+env_names = (0 ... 100).to_a.map!{ |x| x > 0 ? SecureRandom.uuid.gsub(/-/,"") * 3 : 'production'}
+
+#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
+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.', 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")
+
+#Select three environments at random and verify results.
+env_names.sample(3).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/basic_workflow/multi_env_custom_forge_git_module.rb

@@ -0,0 +1,111 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-73 - C59226 - Multiple Environments with Custom, Forge and Git Modules'
+
+#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')
+
+env_names = ['production', 'stage', 'test']
+
+#Verification
+motd_path = '/etc/motd'
+motd_contents = 'Hello!'
+motd_contents_regex = /\A#{motd_contents}\z/
+
+stdlib_notify_message_regex = /The test message is:.*one.*=>.*1.*two.*=>.*bats.*three.*=>.*3.*/
+
+#File
+puppet_file = <<-PUPPETFILE
+mod "puppetlabs/motd"
+mod 'puppetlabs/stdlib',
+  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+
+#Manifest
+manifest = <<-MANIFEST
+  class { 'helloworld': }
+  class { 'motd':
+    content => '#{motd_contents}',
+  }
+  $hash1 = {'one' => 1, 'two' => 2}
+  $hash2 = {'two' => 'bats', 'three' => 3}
+  $merged_hash = merge($hash1, $hash2)
+  notify { 'Test Message':
+    message  => "The test message is: ${merged_hash}"
+  }
+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}")
+
+  step 'Remove Static Modules'
+  on(agents, "rm -rf #{modules_path}/*")
+end
+
+#Setup
+step 'Stub Forge on Master'
+stub_forge_on(master)
+
+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 "Update the \"#{env}\" Environment with Puppetfile"
+    create_remote_file(master, puppet_file_path, puppet_file)
+
+    step "Push Changes to \"#{env}\" Environment"
+    git_add_commit_push(master, env, 'Update site.pp, add modules, add Puppetfile.', 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 -p")
+
+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!')
+      assert_match(stdlib_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
+  end
+end

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

@@ -0,0 +1,117 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-40 - C59223 - Multiple Environments with Custom, Forge and Git Modules Deployed to Static Path'
+
+#Init
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+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)
+local_files_root_path = ENV['FILES'] || 'files'
+helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
+
+env_names = ['production', 'stage', 'test']
+
+#Verification
+motd_path = '/etc/motd'
+motd_contents = 'Hello!'
+motd_contents_regex = /\A#{motd_contents}\z/
+
+stdlib_notify_message_regex = /The test message is:.*one.*=>.*1.*two.*=>.*bats.*three.*=>.*3.*/
+
+#File
+puppet_file = <<-PUPPETFILE
+moduledir '#{@module_path}'
+mod "puppetlabs/motd"
+mod 'puppetlabs/stdlib',
+  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
+PUPPETFILE
+
+puppet_file_path = File.join(git_environments_path, 'Puppetfile')
+
+#Manifest
+manifest = <<-MANIFEST
+  class { 'helloworld': }
+  class { 'motd':
+    content => '#{motd_contents}',
+  }
+  $hash1 = {'one' => 1, 'two' => 2}
+  $hash2 = {'two' => 'bats', 'three' => 3}
+  $merged_hash = merge($hash1, $hash2)
+  notify { 'Test Message':
+    message  => "The test message is: ${merged_hash}"
+  }
+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}")
+
+  step 'Remove Static Modules'
+  on(agents, "rm -rf #{@module_path}/*")
+end
+
+#Setup
+step 'Stub Forge on Master'
+stub_forge_on(master)
+
+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.', 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
+
+step 'Update just the "production" Environment with Puppetfile'
+git_on(master, 'checkout production', git_environments_path)
+create_remote_file(master, puppet_file_path, puppet_file)
+git_add_commit_push(master, 'production', 'Add module.', git_environments_path)
+
+#Tests
+step 'Deploy Environments via r10k'
+on(master, "#{r10k_fqp} deploy environment -v -p")
+
+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!')
+      assert_match(stdlib_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
+  end
+end

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

@@ -0,0 +1,100 @@
+require 'git_utils'
+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
+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')
+
+env_names = ['production', 'stage', 'test']
+
+#Teardown
+teardown do
+  step 'Restore Original "hiera.yaml" Config'
+  on(master, "mv #{hiera_master_config_path}.bak #{hiera_master_config_path}")
+
+  step 'Restart the Puppet Server Service'
+  restart_puppet_server(master)
+
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Backup Current "hiera.yaml" Config'
+on(master, "mv #{hiera_master_config_path} #{hiera_master_config_path}.bak")
+
+step 'Copy New "hiera.yaml" to Puppet Master'
+scp_to(master, hiera_local_config_path, hiera_master_config_path)
+
+env_names.each do |env|
+  #In-line Files
+  hiera_data = <<-HIERA
+---
+hieratest::hiera_message: "I am in the #{env} environment"
+HIERA
+
+  if env == 'production'
+    step "Checkout \"#{env}\" Branch"
+    git_on(master, "checkout #{env}", git_environments_path)
+
+    step "Copy \"hieratest\" Module to \"#{env}\" Environment Git Repo"
+    scp_to(master, hieratest_module_path, File.join(git_environments_path, "site", 'hieratest'))
+
+    step "Update Hiera Data for \"#{env}\" Environment"
+    on(master, "mkdir -p #{hiera_data_dir}")
+    create_remote_file(master, File.join(hiera_data_dir, "#{env}.yaml"), hiera_data)
+
+    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, add hiera data.', 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 "Update Hiera Data for \"#{env}\" Environment"
+    create_remote_file(master, File.join(hiera_data_dir, "#{env}.yaml"), hiera_data)
+
+    step "Push Changes to \"#{env}\" Environment"
+    git_add_commit_push(master, env, 'Add hiera data.', git_environments_path)
+  end
+end
+
+step 'Restart the Puppet Server Service'
+restart_puppet_server(master)
+
+#Tests
+step 'Deploy Environments via r10k'
+on(master, "#{r10k_fqp} deploy environment -v")
+
+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/basic_workflow/multi_env_multi_source.rb

@@ -0,0 +1,133 @@
+require 'erb'
+require 'securerandom'
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'CODEMGMT-85 - C59240 - Multiple Sources with Multiple Branches'
+
+#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_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+
+local_files_root_path = ENV['FILES'] || 'files'
+helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+#Sources and environments structures
+sources = []
+GitEnv = Struct.new(:repo_path,
+                    :repo_name,
+                    :control_remote,
+                    :environments_path,
+                    :site_pp_path,
+                    :site_pp,
+                    :env_names
+                   )
+
+#Push default source as first element
+sources.push(GitEnv.new('/git_repos',
+                        'control',
+                        '/git_repos/environments.git',
+                        '/root/environments',
+                        '/root/environments/manifests/site.pp',
+                        create_site_pp(master_certname, '  include helloworld'),
+                        (0 ... 10).to_a.map!{ |x| x > 0 ? SecureRandom.uuid.gsub(/-/,"") : 'production'}
+                       )
+            )
+
+#Generate the remaining environments
+(0..9).each do
+  source_name = SecureRandom.uuid.gsub(/-/,"")
+  sources.push(GitEnv.new("/tmp/git_repo_#{source_name}",
+                          "environments_#{source_name}",
+                          "/tmp/git_repo_#{source_name}/environments_#{source_name}.git",
+                          "/root/environments_#{source_name}",
+                          "/root/environments_#{source_name}/manifests/site.pp",
+                          create_site_pp(master_certname, '  include helloworld'),
+                          (0 ... 10).to_a.map!{ SecureRandom.uuid.gsub(/-/,"") }
+                         )
+              )
+end
+
+#ERB Template
+r10k_conf_template_path = File.join(local_files_root_path, 'r10k_conf.yaml.erb')
+r10k_conf = ERB.new(File.read(r10k_conf_template_path)).result(binding)
+
+#Teardown
+last_commit = git_last_commit(master, sources.first.environments_path)
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'Remove Git Sources'
+  sources.slice(1, sources.length).each do |source|
+    on(master, "rm -rf #{source.repo_path} #{source.environments_path}")
+  end
+
+  clean_up_r10k(master, last_commit, sources.first.environments_path)
+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 'Create Git Sources'
+sources.slice(1, sources.length).each do |source|
+  init_r10k_source_from_prod(master,
+                             source.repo_path,
+                             source.repo_name,
+                             source.environments_path,
+                             source.env_names.first
+                            )
+end
+
+#Create environments for sources
+sources.each do |source|
+  source.env_names.each do |env_name|
+    if env_name == source.env_names.first
+      step "Checkout \"#{env_name}\" Branch"
+      git_on(master, "checkout #{env_name}", source.environments_path)
+
+      step "Copy \"helloworld\" Module to \"#{env_name}\" Environment Git Repo"
+      scp_to(master, helloworld_module_path, File.join(source.environments_path, "site", 'helloworld'))
+
+      step "Inject New \"site.pp\" to the \"#{env_name}\" Environment"
+      inject_site_pp(master, source.site_pp_path, source.site_pp)
+
+      step "Push Changes to \"#{env_name}\" Environment"
+      git_add_commit_push(master, env_name, 'Update site.pp and add module.', source.environments_path)
+    else
+      step "Create \"#{env_name}\" Branch from \"#{source.env_names.first}\""
+      git_on(master, "checkout #{source.env_names.first}", source.environments_path)
+      git_on(master, "checkout -b #{env_name}", source.environments_path)
+
+      step "Push Changes to \"#{env_name}\" Environment"
+      git_push(master, env_name, source.environments_path)
+    end
+  end
+end
+
+#Tests
+step 'Deploy Environments via r10k'
+on(master, "#{r10k_fqp} deploy environment -v")
+
+#Select three environments at random and verify results.
+sources.sample(3).each do |source|
+  source.env_names.sample(1).each do |env_name|
+    agents.each do |agent|
+      step "Run Puppet Agent Against \"#{env_name}\" Environment"
+      on(agent, puppet('agent', '--test', "--environment #{env_name}"), :acceptable_exit_codes => 2) do |result|
+        assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
+        assert_match(/I am in the #{env_name} environment/, result.stdout, 'Expected message not found!')
+      end
+    end
+  end
+end