r10k 5.0.2 → 5.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.mkd +5 -0
- data/integration/Gemfile +5 -5
- data/integration/pre-suite/10_git_config.rb +1 -1
- data/integration/tests/basic_functionality/proxy_specified_in_configuration.rb +9 -3
- data/integration/tests/basic_functionality/proxy_with_puppetfile.rb +7 -2
- data/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb +1 -1
- data/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb +1 -1
- data/integration/tests/git_source/git_source_git.rb +1 -1
- data/integration/tests/git_source/git_source_ssh.rb +1 -1
- data/integration/tests/git_source/git_source_submodule.rb +1 -1
- data/integration/tests/i18n/deploy_module_with_unicode_in_file_name.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/multi_env_1000_branches.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/multi_env_hiera.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/multi_env_multi_source.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/multi_source_custom_forge_git_module.rb +2 -2
- data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_git_module.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_module.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_module.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_module_already_installed.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_non-existent_base_dir.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb +1 -1
- data/integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb +2 -2
- data/integration/tests/user_scenario/basic_workflow/single_env_upgrade_forge_mod_revert_change.rb +3 -3
- data/integration/tests/user_scenario/complex_workflow/multi_env_add_change_remove.rb +4 -4
- data/integration/tests/user_scenario/complex_workflow/multi_env_remove_re-add.rb +3 -3
- data/integration/tests/user_scenario/complex_workflow/multi_env_unamanaged.rb +2 -2
- data/integration/tests/user_scenario/complex_workflow/single_env_git_module_update.rb +2 -2
- data/lib/r10k/version.rb +1 -1
- data/r10k.gemspec +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e378f25c00dcaee4e145fbd363544c2c23812e6ff39a03cb0c0e389c3039962f
|
|
4
|
+
data.tar.gz: 12a081e058b839390b7ef1a2df68e90fa944b66b05cd24afa101d9cf366b71ea
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 90a659937372dec3213ceb4e90629da1f3a0cc010798cce51bac069dfaf77593d68f69ec8ddc6f0b6c7a34d5256a151369746d154eb985812fc96bd036f6f819
|
|
7
|
+
data.tar.gz: 699949e6f4aa51fcb33db5bacc9f7946cae5d356b3d49d6ecf2b0eb5dea93cdcd1d857da4d11d6494908c8f87a6e74481e9f3161f4bd016977d761a04c7a552b
|
data/CHANGELOG.mkd
CHANGED
data/integration/Gemfile
CHANGED
|
@@ -10,9 +10,9 @@ def location_for(place, fake_version = nil)
|
|
|
10
10
|
end
|
|
11
11
|
end
|
|
12
12
|
|
|
13
|
-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~>
|
|
14
|
-
gem 'beaker-pe', '~> 3.
|
|
15
|
-
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~>
|
|
16
|
-
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0
|
|
17
|
-
gem 'rototiller', '
|
|
13
|
+
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 6')
|
|
14
|
+
gem 'beaker-pe', '~> 3.6'
|
|
15
|
+
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 2')
|
|
16
|
+
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 1.0')
|
|
17
|
+
gem 'rototiller', '~> 1'
|
|
18
18
|
gem 'beaker-qa-i18n'
|
|
@@ -34,7 +34,7 @@ on(master, puppet("module install puppetlabs-git --modulepath #{@module_path}")
|
|
|
34
34
|
|
|
35
35
|
step 'Install and Configure Git'
|
|
36
36
|
on(master, puppet('apply'), :stdin => git_manifest, :acceptable_exit_codes => [0,2]) do |result|
|
|
37
|
-
|
|
37
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
38
38
|
end
|
|
39
39
|
on(master, 'git config --system --add safe.directory "*"')
|
|
40
40
|
|
|
@@ -86,10 +86,16 @@ git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_pat
|
|
|
86
86
|
step 'Install and configure squid proxy'
|
|
87
87
|
on(master, install_squid)
|
|
88
88
|
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
if master['platform'] =~ /el-10/
|
|
90
|
+
step 'Open up squid'
|
|
91
|
+
on(master, "sed -i 's/# http_access allow localnet/http_access allow localnet/' /etc/squid/squid.conf")
|
|
92
|
+
else
|
|
93
|
+
# who uses iptables anymore?
|
|
94
|
+
step 'Turn off the firewall'
|
|
95
|
+
on(master, puppet("apply -e 'service {'iptables' : ensure => stopped}'"))
|
|
96
|
+
end
|
|
91
97
|
|
|
92
|
-
step '
|
|
98
|
+
step 'Start squid proxy'
|
|
93
99
|
on(master, puppet("apply -e 'service {'squid' : ensure => running}'"))
|
|
94
100
|
|
|
95
101
|
#Tests
|
|
@@ -41,8 +41,13 @@ step 'Install and configure squid proxy'
|
|
|
41
41
|
on(master, install_squid)
|
|
42
42
|
master.add_env_var('http_proxy', "http://#{master.hostname}:3128")
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
|
|
44
|
+
if master['platform'] =~ /el-10/
|
|
45
|
+
step 'Open up squid'
|
|
46
|
+
on(master, "sed -i 's/# http_access allow localnet/http_access allow localnet/' /etc/squid/squid.conf")
|
|
47
|
+
else
|
|
48
|
+
step 'Turn off the firewall'
|
|
49
|
+
on(master, puppet("apply -e 'service {'iptables' : ensure => stopped}'"))
|
|
50
|
+
end
|
|
46
51
|
|
|
47
52
|
step 'start squid proxy'
|
|
48
53
|
on(master, puppet("apply -e 'service {'squid' : ensure => running}'"))
|
|
@@ -103,7 +103,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
103
103
|
agents.each do |agent|
|
|
104
104
|
step "Run Puppet Agent"
|
|
105
105
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
106
|
-
|
|
106
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
107
107
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
108
108
|
end
|
|
109
109
|
end
|
|
@@ -102,7 +102,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
102
102
|
agents.each do |agent|
|
|
103
103
|
step "Run Puppet Agent"
|
|
104
104
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
105
|
-
|
|
105
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
106
106
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
107
107
|
end
|
|
108
108
|
end
|
|
@@ -119,7 +119,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
119
119
|
agents.each do |agent|
|
|
120
120
|
step "Run Puppet Agent"
|
|
121
121
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
122
|
-
|
|
122
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
123
123
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
124
124
|
end
|
|
125
125
|
end
|
|
@@ -81,7 +81,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
81
81
|
agents.each do |agent|
|
|
82
82
|
step "Run Puppet Agent"
|
|
83
83
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
84
|
-
|
|
84
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
85
85
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
86
86
|
end
|
|
87
87
|
end
|
|
@@ -63,7 +63,7 @@ agents.each do |agent|
|
|
|
63
63
|
step "Run Puppet Agent"
|
|
64
64
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 1) do |result|
|
|
65
65
|
expect_failure('Expected to fail due to RK-30') do
|
|
66
|
-
|
|
66
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
67
67
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
68
68
|
end
|
|
69
69
|
end
|
|
@@ -57,7 +57,7 @@ test_i18n_strings(10, [:syntax, :white_space]) do |test_string|
|
|
|
57
57
|
agents.each do |agent|
|
|
58
58
|
step "Run Puppet Agent"
|
|
59
59
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
60
|
-
|
|
60
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
61
61
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
62
62
|
end
|
|
63
63
|
end
|
|
@@ -59,7 +59,7 @@ env_names.sample(3).each do |env|
|
|
|
59
59
|
agents.each do |agent|
|
|
60
60
|
step "Run Puppet Agent Against \"#{env}\" Environment"
|
|
61
61
|
on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
|
|
62
|
-
|
|
62
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
63
63
|
assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
|
|
64
64
|
end
|
|
65
65
|
end
|
|
@@ -96,7 +96,7 @@ env_names.each do |env|
|
|
|
96
96
|
agents.each do |agent|
|
|
97
97
|
step "Run Puppet Agent Against \"#{env}\" Environment"
|
|
98
98
|
on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
|
|
99
|
-
|
|
99
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
100
100
|
assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
|
|
101
101
|
assert_match(stdlib_notify_message_regex, result.stdout, 'Expected message not found!')
|
|
102
102
|
end
|
data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb
CHANGED
|
@@ -102,7 +102,7 @@ env_names.each do |env|
|
|
|
102
102
|
agents.each do |agent|
|
|
103
103
|
step "Run Puppet Agent Against \"#{env}\" Environment"
|
|
104
104
|
on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
|
|
105
|
-
|
|
105
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
106
106
|
assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
|
|
107
107
|
assert_match(stdlib_notify_message_regex, result.stdout, 'Expected message not found!')
|
|
108
108
|
end
|
|
@@ -93,7 +93,7 @@ env_names.each do |env|
|
|
|
93
93
|
agents.each do |agent|
|
|
94
94
|
step "Run Puppet Agent Against \"#{env}\" Environment"
|
|
95
95
|
on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
|
|
96
|
-
|
|
96
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
97
97
|
assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
|
|
98
98
|
end
|
|
99
99
|
end
|
|
@@ -125,7 +125,7 @@ sources.sample(3).each do |source|
|
|
|
125
125
|
agents.each do |agent|
|
|
126
126
|
step "Run Puppet Agent Against \"#{env_name}\" Environment"
|
|
127
127
|
on(agent, puppet('agent', '--test', "--environment #{env_name}"), :acceptable_exit_codes => 2) do |result|
|
|
128
|
-
|
|
128
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
129
129
|
assert_match(/I am in the #{env_name} environment/, result.stdout, 'Expected message not found!')
|
|
130
130
|
end
|
|
131
131
|
end
|
|
@@ -140,7 +140,7 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
140
140
|
agents.each do |agent|
|
|
141
141
|
step 'Run Puppet Agent Against "production" Environment'
|
|
142
142
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
143
|
-
|
|
143
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
144
144
|
assert_match(/I am in the production environment/, result.stdout, 'Expected message not found!')
|
|
145
145
|
end
|
|
146
146
|
|
|
@@ -151,7 +151,7 @@ agents.each do |agent|
|
|
|
151
151
|
|
|
152
152
|
step 'Run Puppet Agent Against "stage" Environment'
|
|
153
153
|
on(agent, puppet('agent', '--test', '--environment stage'), :acceptable_exit_codes => 2) do |result|
|
|
154
|
-
|
|
154
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
155
155
|
assert_match(/I am in the stage environment/, result.stdout, 'Expected message not found!')
|
|
156
156
|
assert_match(stdlib_notify_message_regex, result.stdout, 'Expected message not found!')
|
|
157
157
|
end
|
|
@@ -41,5 +41,5 @@ git_add_commit_push(master, 'production', 'Update Puppetfile.', git_environments
|
|
|
41
41
|
#Tests
|
|
42
42
|
step 'Attempt to Deploy via r10k'
|
|
43
43
|
on(master, "#{r10k_fqp} deploy environment -v -p", :acceptable_exit_codes => 1) do |result|
|
|
44
|
-
|
|
44
|
+
refute_match(error_message_regex, result.stderr, 'Expected message not found!')
|
|
45
45
|
end
|
|
@@ -69,7 +69,7 @@ on(master, "cd #{prod_env_test_files_path};md5sum -c #{prod_env_checksum_file_pa
|
|
|
69
69
|
agents.each do |agent|
|
|
70
70
|
step "Run Puppet Agent"
|
|
71
71
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
72
|
-
|
|
72
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
73
73
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
74
74
|
end
|
|
75
75
|
end
|
|
@@ -86,7 +86,7 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
86
86
|
agents.each do |agent|
|
|
87
87
|
step "Run Puppet Agent"
|
|
88
88
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
89
|
-
|
|
89
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
90
90
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
91
91
|
end
|
|
92
92
|
|
|
@@ -67,7 +67,7 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
67
67
|
agents.each do |agent|
|
|
68
68
|
step "Run Puppet Agent"
|
|
69
69
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
70
|
-
|
|
70
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
71
71
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
72
72
|
end
|
|
73
73
|
|
|
@@ -43,7 +43,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
43
43
|
agents.each do |agent|
|
|
44
44
|
step "Run Puppet Agent"
|
|
45
45
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
46
|
-
|
|
46
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
47
47
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
48
48
|
end
|
|
49
49
|
end
|
|
@@ -69,7 +69,7 @@ on(master, "cd #{prod_env_test_files_path};md5sum -c #{prod_env_checksum_file_pa
|
|
|
69
69
|
agents.each do |agent|
|
|
70
70
|
step "Run Puppet Agent"
|
|
71
71
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
72
|
-
|
|
72
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
73
73
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
74
74
|
end
|
|
75
75
|
end
|
|
@@ -69,7 +69,7 @@ on(master, "#{r10k_fqp} deploy environment -p -v")
|
|
|
69
69
|
agents.each do |agent|
|
|
70
70
|
step "Run Puppet Agent"
|
|
71
71
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
|
|
72
|
-
|
|
72
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
73
73
|
end
|
|
74
74
|
|
|
75
75
|
step 'Verify Contents of MOTD Module'
|
|
@@ -88,7 +88,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
88
88
|
agents.each do |agent|
|
|
89
89
|
step "Run Puppet Agent"
|
|
90
90
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
91
|
-
|
|
91
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
92
92
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
93
93
|
end
|
|
94
94
|
end
|
|
@@ -65,7 +65,7 @@ on(master, puppet("module install puppetlabs-motd --modulepath #{moduledir}"))
|
|
|
65
65
|
agents.each do |agent|
|
|
66
66
|
step 'Run Puppet Agent Against "production" Environment'
|
|
67
67
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
68
|
-
|
|
68
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
69
69
|
end
|
|
70
70
|
|
|
71
71
|
step "Verify MOTD Contents"
|
|
@@ -80,7 +80,7 @@ on(master, "chmod 644 #{motd_template_path}")
|
|
|
80
80
|
agents.each do |agent|
|
|
81
81
|
step 'Run Puppet Agent'
|
|
82
82
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
|
|
83
|
-
|
|
83
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
84
84
|
end
|
|
85
85
|
|
|
86
86
|
step 'Verify MOTD Contents for Forge Version of Module'
|
|
@@ -104,7 +104,7 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
104
104
|
agents.each do |agent|
|
|
105
105
|
step 'Run Puppet Agent'
|
|
106
106
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
|
|
107
|
-
|
|
107
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
108
108
|
end
|
|
109
109
|
|
|
110
110
|
step 'Verify MOTD Contents for Git Version of Module'
|
data/integration/tests/user_scenario/basic_workflow/single_env_upgrade_forge_mod_revert_change.rb
CHANGED
|
@@ -83,7 +83,7 @@ on(master, "chmod 644 #{motd_template_path}")
|
|
|
83
83
|
agents.each do |agent|
|
|
84
84
|
step 'Run Puppet Agent'
|
|
85
85
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
|
|
86
|
-
|
|
86
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
87
87
|
end
|
|
88
88
|
|
|
89
89
|
step 'Verify MOTD Contents for Forge Version of Module'
|
|
@@ -115,7 +115,7 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
115
115
|
agents.each do |agent|
|
|
116
116
|
step 'Run Puppet Agent'
|
|
117
117
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
|
|
118
|
-
|
|
118
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
119
119
|
end
|
|
120
120
|
|
|
121
121
|
step 'Verify MOTD Contents for New Version of Module'
|
|
@@ -148,7 +148,7 @@ on(master, "chmod 644 #{motd_template_path}")
|
|
|
148
148
|
agents.each do |agent|
|
|
149
149
|
step 'Run Puppet Agent'
|
|
150
150
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => [0,2]) do |result|
|
|
151
|
-
|
|
151
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
152
152
|
end
|
|
153
153
|
|
|
154
154
|
step 'Verify MOTD Contents for Old Version of Module'
|
|
@@ -97,7 +97,7 @@ initial_env_names.each do |env|
|
|
|
97
97
|
agents.each do |agent|
|
|
98
98
|
step "Run Puppet Agent Against \"#{env}\" Environment"
|
|
99
99
|
on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
|
|
100
|
-
|
|
100
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
101
101
|
assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
|
|
102
102
|
end
|
|
103
103
|
end
|
|
@@ -132,13 +132,13 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
132
132
|
agents.each do |agent|
|
|
133
133
|
step 'Run Puppet Agent Against "production" Environment'
|
|
134
134
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
135
|
-
|
|
135
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
136
136
|
assert_match(prod_env_notify_message_regex, result.stdout, 'Expected message not found!')
|
|
137
137
|
end
|
|
138
138
|
|
|
139
139
|
step 'Run Puppet Agent Against "temp" Environment'
|
|
140
140
|
on(agent, puppet('agent', '--test', '--environment temp'), :acceptable_exit_codes => 2) do |result|
|
|
141
|
-
|
|
141
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
142
142
|
assert_match(test_env_notify_message_regex, result.stdout, 'Expected message not found!')
|
|
143
143
|
end
|
|
144
144
|
|
|
@@ -149,7 +149,7 @@ agents.each do |agent|
|
|
|
149
149
|
|
|
150
150
|
step 'Run Puppet Agent Against "stage" Environment'
|
|
151
151
|
on(agent, puppet('agent', '--test', '--environment stage'), :acceptable_exit_codes => 2) do |result|
|
|
152
|
-
|
|
152
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
153
153
|
assert_match(stage_env_notify_message_regex, result.stdout, 'Expected message not found!')
|
|
154
154
|
end
|
|
155
155
|
|
|
@@ -59,7 +59,7 @@ initial_env_names.each do |env|
|
|
|
59
59
|
agents.each do |agent|
|
|
60
60
|
step "Run Puppet Agent Against \"#{env}\" Environment"
|
|
61
61
|
on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
|
|
62
|
-
|
|
62
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
63
63
|
assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
|
|
64
64
|
end
|
|
65
65
|
end
|
|
@@ -78,7 +78,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
78
78
|
agents.each do |agent|
|
|
79
79
|
step 'Run Puppet Agent Against "production" Environment'
|
|
80
80
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
81
|
-
|
|
81
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
82
82
|
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
|
83
83
|
end
|
|
84
84
|
|
|
@@ -104,7 +104,7 @@ initial_env_names.each do |env|
|
|
|
104
104
|
agents.each do |agent|
|
|
105
105
|
step "Run Puppet Agent Against \"#{env}\" Environment"
|
|
106
106
|
on(agent, puppet('agent', '--test', "--environment #{env}"), :acceptable_exit_codes => 2) do |result|
|
|
107
|
-
|
|
107
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
108
108
|
assert_match(/I am in the #{env} environment/, result.stdout, 'Expected message not found!')
|
|
109
109
|
end
|
|
110
110
|
end
|
|
@@ -49,7 +49,7 @@ on(master, "#{r10k_fqp} deploy environment -v")
|
|
|
49
49
|
agents.each do |agent|
|
|
50
50
|
step 'Run Puppet Agent'
|
|
51
51
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
52
|
-
|
|
52
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
53
53
|
assert_match(notify_message_prod_env_regex, result.stdout, 'Expected message not found!')
|
|
54
54
|
end
|
|
55
55
|
end
|
|
@@ -60,7 +60,7 @@ on(master, "cp -r #{environment_path}/production #{environment_path}/test")
|
|
|
60
60
|
agents.each do |agent|
|
|
61
61
|
step 'Run Puppet Agent Against "test" Environment'
|
|
62
62
|
on(agent, puppet('agent', '--test', '--environment test'), :acceptable_exit_codes => 2) do |result|
|
|
63
|
-
|
|
63
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
64
64
|
assert_match(notify_message_test_env_regex, result.stdout, 'Expected message not found!')
|
|
65
65
|
end
|
|
66
66
|
end
|
|
@@ -78,7 +78,7 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
78
78
|
agents.each do |agent|
|
|
79
79
|
step 'Run Puppet Agent'
|
|
80
80
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
81
|
-
|
|
81
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
82
82
|
assert_match(notify_original_message_regex, result.stdout, 'Expected message not found!')
|
|
83
83
|
end
|
|
84
84
|
end
|
|
@@ -94,7 +94,7 @@ on(master, "#{r10k_fqp} deploy environment -v -p")
|
|
|
94
94
|
agents.each do |agent|
|
|
95
95
|
step 'Run Puppet Agent'
|
|
96
96
|
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
|
97
|
-
|
|
97
|
+
refute_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
|
98
98
|
assert_match(notify_updated_message_regex, result.stdout, 'Expected message not found!')
|
|
99
99
|
end
|
|
100
100
|
end
|
data/lib/r10k/version.rb
CHANGED
|
@@ -2,5 +2,5 @@ module R10K
|
|
|
2
2
|
# When updating to a new major (X) or minor (Y) version, include `#major` or
|
|
3
3
|
# `#minor` (respectively) in your commit message to trigger the appropriate
|
|
4
4
|
# release. Otherwise, a new patch (Z) version will be released.
|
|
5
|
-
VERSION = '5.0.
|
|
5
|
+
VERSION = '5.0.3'
|
|
6
6
|
end
|
data/r10k.gemspec
CHANGED
|
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
|
|
|
26
26
|
s.add_dependency 'cri', '>= 2.15.10'
|
|
27
27
|
s.add_dependency 'log4r', '1.1.10'
|
|
28
28
|
s.add_dependency 'multi_json', '~> 1.10'
|
|
29
|
-
s.add_dependency 'puppet_forge', '>=
|
|
29
|
+
s.add_dependency 'puppet_forge', '>= 6.1.0', '< 7'
|
|
30
30
|
s.add_dependency 'gettext-setup', '>=0.24', '<2.0'
|
|
31
31
|
s.add_dependency 'jwt', '>= 2.2.3', '< 3'
|
|
32
32
|
s.add_dependency 'minitar', '>= 0.9', '< 2'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: r10k
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 5.0.
|
|
4
|
+
version: 5.0.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Adrien Thebo
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2026-04-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: colored2
|
|
@@ -72,7 +72,7 @@ dependencies:
|
|
|
72
72
|
requirements:
|
|
73
73
|
- - ">="
|
|
74
74
|
- !ruby/object:Gem::Version
|
|
75
|
-
version:
|
|
75
|
+
version: 6.1.0
|
|
76
76
|
- - "<"
|
|
77
77
|
- !ruby/object:Gem::Version
|
|
78
78
|
version: '7'
|
|
@@ -82,7 +82,7 @@ dependencies:
|
|
|
82
82
|
requirements:
|
|
83
83
|
- - ">="
|
|
84
84
|
- !ruby/object:Gem::Version
|
|
85
|
-
version:
|
|
85
|
+
version: 6.1.0
|
|
86
86
|
- - "<"
|
|
87
87
|
- !ruby/object:Gem::Version
|
|
88
88
|
version: '7'
|