r10k 1.4.2 → 1.5.1
Sign up to get free protection for your applications and to get access to all the features.
- data/.travis.yml +2 -0
- data/CHANGELOG.mkd +192 -0
- data/CONTRIBUTING.mkd +3 -3
- data/Gemfile +4 -0
- data/README.mkd +13 -6
- data/doc/dynamic-environments/configuration.mkd +77 -8
- data/doc/dynamic-environments/git-environments.mkd +12 -2
- data/doc/dynamic-environments/quickstart.mkd +6 -0
- data/doc/faq.mkd +6 -6
- data/doc/git/cloning-and-mirroring.mkd +60 -0
- data/doc/git/providers.mkd +68 -0
- data/integration/Gemfile +3 -0
- data/integration/README.mkd +29 -0
- data/integration/configs/README.mkd +7 -0
- data/integration/configs/pe/centos-6-64mda +25 -0
- data/integration/configs/pe/centos-7-64mda +25 -0
- data/integration/configs/pe/debian-6-64mda +25 -0
- data/integration/configs/pe/debian-7-64mda +25 -0
- data/integration/configs/pe/redhat-6-64mda +25 -0
- data/integration/configs/pe/redhat-7-64mda +25 -0
- data/integration/configs/pe/sles-11-64mda +25 -0
- data/integration/configs/pe/ubuntu-1004-64mda +25 -0
- data/integration/configs/pe/ubuntu-1204-64mda +25 -0
- data/integration/configs/pe/ubuntu-1404-64mda +25 -0
- data/integration/files/README.mkd +4 -0
- data/integration/files/hiera.yaml +8 -0
- data/integration/files/modules/helloworld/manifests/init.pp +3 -0
- data/integration/files/modules/hieratest/manifests/init.pp +3 -0
- data/integration/files/modules/unicode/files/pretend_unicode +1 -0
- data/integration/files/modules/unicode/manifests/init.pp +6 -0
- data/integration/files/pre-suite/prod_env.config +3 -0
- data/integration/files/r10k_conf.yaml.erb +9 -0
- data/integration/lib/README.mkd +4 -0
- data/integration/lib/git_utils.rb +205 -0
- data/integration/lib/master_manipulator.rb +205 -0
- data/integration/lib/r10k_utils.rb +166 -0
- data/integration/manifests/README.mkd +4 -0
- data/integration/pre-suite/00_pe_install.rb +4 -0
- data/integration/pre-suite/01_git_config.rb +59 -0
- data/integration/pre-suite/02_pe_r10k.rb +60 -0
- data/integration/pre-suite/03_test_utils.rb +17 -0
- data/integration/pre-suite/README.mkd +5 -0
- data/integration/test_run_scripts/README.mkd +5 -0
- data/integration/test_run_scripts/all_tests-rugged-pe-centos6.sh +20 -0
- data/integration/test_run_scripts/all_tests-rugged-pe-rhel7.sh +20 -0
- data/integration/test_run_scripts/all_tests-rugged-pe-sles11.sh +20 -0
- data/integration/test_run_scripts/all_tests-rugged-pe-ubuntu1204.sh +20 -0
- data/integration/test_run_scripts/all_tests-rugged-pe-ubuntu1404.sh +20 -0
- data/integration/test_run_scripts/all_tests-shellgit-pe-centos6.sh +20 -0
- data/integration/test_run_scripts/all_tests-shellgit-pe-rhel7.sh +20 -0
- data/integration/test_run_scripts/all_tests-shellgit-pe-sles11.sh +20 -0
- data/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1204.sh +20 -0
- data/integration/test_run_scripts/all_tests-shellgit-pe-ubuntu1404.sh +20 -0
- data/integration/test_run_scripts/basic_functionality/all_tests-pe-centos6.sh +20 -0
- data/integration/test_run_scripts/command_line/all_tests-pe-centos6.sh +20 -0
- data/integration/test_run_scripts/git_source/all_tests-pe-centos6.sh +20 -0
- data/integration/test_run_scripts/user_scenario/basic_workflow/all_tests-pe-centos6.sh +20 -0
- data/integration/test_run_scripts/user_scenario/complex_workflow/all_tests-pe-centos6.sh +20 -0
- data/integration/tests/README.mkd +4 -0
- data/integration/tests/basic_functionality/negative/neg_deploy_with_invalid_r10k_yaml.rb +46 -0
- data/integration/tests/basic_functionality/negative/neg_deploy_with_missing_r10k_yaml.rb +27 -0
- data/integration/tests/command_line/deploy_env_without_mod_update.rb +75 -0
- data/integration/tests/command_line/negative/neg_deploy_env_with_module_update.rb +76 -0
- data/integration/tests/command_line/negative/neg_invalid_cli_dep_flag.rb +22 -0
- data/integration/tests/command_line/negative/neg_invalid_cli_env_flag.rb +22 -0
- data/integration/tests/command_line/negative/neg_invalid_cmd_line_arg.rb +24 -0
- data/integration/tests/git_source/git_source_git.rb +123 -0
- data/integration/tests/git_source/git_source_ssh.rb +84 -0
- data/integration/tests/git_source/git_source_submodule.rb +69 -0
- data/integration/tests/git_source/negative/neg_git_broken_remote.rb +37 -0
- data/integration/tests/git_source/negative/neg_git_unauthorized_https.rb +45 -0
- data/integration/tests/git_source/negative/neg_git_unauthorized_ssh.rb +72 -0
- data/integration/tests/git_source/negative/neg_git_unicode_branch.rb +34 -0
- data/integration/tests/user_scenario/basic_workflow/multi_env_1000_branches.rb +66 -0
- data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module.rb +110 -0
- data/integration/tests/user_scenario/basic_workflow/multi_env_custom_forge_git_module_static.rb +113 -0
- data/integration/tests/user_scenario/basic_workflow/multi_env_hiera.rb +93 -0
- data/integration/tests/user_scenario/basic_workflow/multi_env_multi_source.rb +132 -0
- data/integration/tests/user_scenario/basic_workflow/multi_source_custom_forge_git_module.rb +160 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_basedir.rb +45 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_forge_module.rb +43 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module.rb +40 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module_ref.rb +42 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_remote.rb +44 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_branch_name_collision.rb +63 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb +73 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_duplicate_module_names.rb +45 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_inaccessible_forge.rb +51 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_invalid_env_name.rb +33 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_invalid_puppet_file.rb +35 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_module_specified_at_deleted_release.rb +44 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_read_only.rb +57 -0
- data/integration/tests/user_scenario/basic_workflow/negative/neg_specify_deleted_forge_module.rb +44 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_10000_files.rb +73 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_git_module.rb +103 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_forge_module.rb +80 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_custom_module.rb +48 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_large_files.rb +73 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_module_already_installed.rb +81 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_module_last_release_deleted.rb +67 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_non-existent_base_dir.rb +93 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_purge_unmanaged_modules.rb +92 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_switch_forge_git_module.rb +116 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_unicode_paths.rb +59 -0
- data/integration/tests/user_scenario/basic_workflow/single_env_upgrade_forge_mod_revert_change.rb +165 -0
- data/integration/tests/user_scenario/complex_workflow/multi_env_add_change_remove.rb +162 -0
- data/integration/tests/user_scenario/complex_workflow/multi_env_remove_re-add.rb +110 -0
- data/lib/r10k/action/cri_runner.rb +10 -13
- data/lib/r10k/cli.rb +3 -8
- data/lib/r10k/cli/version.rb +10 -1
- data/lib/r10k/deployment/config.rb +26 -6
- data/lib/r10k/deployment/config/loader.rb +38 -29
- data/lib/r10k/deployment/source.rb +2 -4
- data/lib/r10k/environment/git.rb +10 -19
- data/lib/r10k/environment/name.rb +86 -0
- data/lib/r10k/errors.rb +8 -5
- data/lib/r10k/feature.rb +35 -0
- data/lib/r10k/feature/collection.rb +23 -0
- data/lib/r10k/features.rb +18 -0
- data/lib/r10k/git.rb +106 -12
- data/lib/r10k/git/alternates.rb +2 -2
- data/lib/r10k/git/cache.rb +43 -26
- data/lib/r10k/git/errors.rb +12 -6
- data/lib/r10k/git/head.rb +3 -0
- data/lib/r10k/git/ref.rb +3 -0
- data/lib/r10k/git/remote_head.rb +6 -0
- data/lib/r10k/git/repository.rb +6 -0
- data/lib/r10k/git/rugged.rb +17 -0
- data/lib/r10k/git/rugged/bare_repository.rb +86 -0
- data/lib/r10k/git/rugged/base_repository.rb +90 -0
- data/lib/r10k/git/rugged/cache.rb +11 -0
- data/lib/r10k/git/rugged/thin_repository.rb +72 -0
- data/lib/r10k/git/rugged/working_repository.rb +99 -0
- data/lib/r10k/git/shellgit.rb +9 -0
- data/lib/r10k/git/shellgit/bare_repository.rb +29 -0
- data/lib/r10k/git/shellgit/base_repository.rb +102 -0
- data/lib/r10k/git/shellgit/cache.rb +11 -0
- data/lib/r10k/git/shellgit/thin_repository.rb +56 -0
- data/lib/r10k/git/shellgit/working_repository.rb +73 -0
- data/lib/r10k/git/stateful_repository.rb +80 -0
- data/lib/r10k/git/tag.rb +3 -0
- data/lib/r10k/git/working_dir.rb +15 -2
- data/lib/r10k/logging.rb +73 -36
- data/lib/r10k/logging/terminaloutputter.rb +36 -0
- data/lib/r10k/module/forge.rb +10 -9
- data/lib/r10k/module/git.rb +14 -44
- data/lib/r10k/module/metadata_file.rb +31 -0
- data/lib/r10k/module/svn.rb +0 -1
- data/lib/r10k/module_repository/forge.rb +20 -7
- data/lib/r10k/puppetfile.rb +1 -1
- data/lib/r10k/settings/container.rb +6 -0
- data/lib/r10k/settings/mixin.rb +9 -0
- data/lib/r10k/source.rb +2 -3
- data/lib/r10k/source/base.rb +5 -5
- data/lib/r10k/source/git.rb +11 -86
- data/lib/r10k/source/svn.rb +8 -52
- data/lib/r10k/util/basedir.rb +4 -4
- data/lib/r10k/util/commands.rb +31 -0
- data/lib/r10k/util/exec_env.rb +36 -0
- data/lib/r10k/util/platform.rb +4 -0
- data/lib/r10k/util/purgeable.rb +2 -2
- data/lib/r10k/util/subprocess.rb +3 -7
- data/lib/r10k/util/subprocess/runner.rb +3 -28
- data/lib/r10k/util/subprocess/runner/posix.rb +103 -0
- data/lib/r10k/util/subprocess/runner/pump.rb +59 -0
- data/lib/r10k/util/subprocess/{windows/runner.rb → runner/windows.rb} +2 -11
- data/lib/r10k/util/symbolize_keys.rb +31 -0
- data/lib/r10k/version.rb +1 -1
- data/lib/shared/puppet/module_tool/metadata.rb +197 -0
- data/r10k.gemspec +7 -5
- data/spec/fixtures/integration/git/puppet-boolean-bare.tar +0 -0
- data/spec/fixtures/module/forge/bad_module/metadata.json +1 -0
- data/spec/fixtures/unit/util/subprocess/posix/runner/no-execute.sh +3 -0
- data/spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/and_the_expected_version_is_latest/can_fetch_all_versions_of_a_given_module.yml +171 -26
- data/spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/and_the_expected_version_is_latest/can_fetch_the_latest_version_of_a_given_module.yml +171 -26
- data/spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/and_the_expected_version_is_latest/ignores_deleted_releases.yml +190 -0
- data/spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/it_handles_errors_from_forgeapi_puppetlabs_com/raises_an_error_for_a_non-existant_module.yml +34 -0
- data/spec/fixtures/vcr/cassettes/R10K_Module_Forge/and_the_expected_version_is_latest/sets_the_expected_version_based_on_the_latest_forge_version.yml +87 -26
- data/spec/integration/git/rugged/bare_repository_spec.rb +13 -0
- data/spec/integration/git/rugged/thin_repository_spec.rb +14 -0
- data/spec/integration/git/rugged/working_repository_spec.rb +13 -0
- data/spec/integration/git/shellgit/bare_repository_spec.rb +13 -0
- data/spec/integration/git/shellgit/thin_repository_spec.rb +14 -0
- data/spec/integration/git/shellgit/working_repository_spec.rb +13 -0
- data/spec/integration/git/stateful_repository_spec.rb +104 -0
- data/spec/matchers/match_realpath.rb +18 -0
- data/spec/shared-contexts/git-fixtures.rb +55 -0
- data/spec/shared-examples/git-repository.rb +38 -0
- data/spec/shared-examples/git/bare_repository.rb +70 -0
- data/spec/shared-examples/git/thin_repository.rb +26 -0
- data/spec/shared-examples/git/working_repository.rb +115 -0
- data/spec/shared-examples/subprocess-runner.rb +83 -0
- data/spec/spec_helper.rb +13 -9
- data/spec/unit/action/cri_runner_spec.rb +0 -6
- data/spec/unit/action/puppetfile/{cri_action_spec.rb → cri_runner_spec.rb} +0 -0
- data/spec/unit/deployment/config/loader_spec.rb +48 -0
- data/spec/unit/deployment/config_spec.rb +49 -0
- data/spec/unit/environment/git_spec.rb +5 -39
- data/spec/unit/environment/name_spec.rb +135 -0
- data/spec/unit/feature_spec.rb +50 -0
- data/spec/unit/git/alternates_spec.rb +1 -1
- data/spec/unit/git/cache_spec.rb +32 -19
- data/spec/unit/git/commit_spec.rb +1 -0
- data/spec/unit/git/head_spec.rb +1 -6
- data/spec/unit/git/ref_spec.rb +0 -23
- data/spec/unit/git/rugged/cache_spec.rb +26 -0
- data/spec/unit/git/shellgit/cache_spec.rb +27 -0
- data/spec/unit/git/stateful_repository_spec.rb +43 -0
- data/spec/unit/git/tag_spec.rb +1 -0
- data/spec/unit/git/working_dir_spec.rb +1 -0
- data/spec/unit/git_spec.rb +74 -0
- data/spec/unit/logging/terminaloutputter_spec.rb +53 -0
- data/spec/unit/logging_spec.rb +68 -0
- data/spec/unit/module/forge_spec.rb +7 -38
- data/spec/unit/module/git_spec.rb +7 -38
- data/spec/unit/module/metadata_file_spec.rb +69 -0
- data/spec/unit/module/svn_spec.rb +0 -4
- data/spec/unit/module_repository/forge_spec.rb +22 -1
- data/spec/unit/puppet/module_tool/metadata_spec.rb +301 -0
- data/spec/unit/settings/container_spec.rb +17 -0
- data/spec/unit/source/git_spec.rb +0 -123
- data/spec/unit/source/svn_spec.rb +66 -0
- data/spec/unit/util/commands_spec.rb +61 -0
- data/spec/unit/util/exec_env_spec.rb +56 -0
- data/spec/unit/util/subprocess/runner/posix_spec.rb +7 -0
- data/spec/unit/util/subprocess/runner/pump_spec.rb +79 -0
- data/spec/unit/util/subprocess_spec.rb +3 -2
- data/spec/unit/util/symbolize_keys_spec.rb +51 -0
- metadata +226 -45
- data/lib/r10k/execution.rb +0 -47
- data/lib/r10k/module/metadata.rb +0 -47
- data/lib/r10k/util/core_ext/hash_ext.rb +0 -19
- data/lib/r10k/util/subprocess/io.rb +0 -7
- data/lib/r10k/util/subprocess/posix.rb +0 -4
- data/lib/r10k/util/subprocess/posix/io.rb +0 -7
- data/lib/r10k/util/subprocess/posix/runner.rb +0 -140
- data/lib/r10k/util/subprocess/windows.rb +0 -4
- data/lib/r10k/util/subprocess/windows/io.rb +0 -6
- data/spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/looking_up_versions.yml +0 -42
- data/spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/looking_up_versions/can_fetch_all_versions_of_a_given_module.yml +0 -42
- data/spec/fixtures/vcr/cassettes/R10K_ModuleRepository_Forge/looking_up_versions/can_fetch_the_latest_version_of_a_given_module.yml +0 -42
- data/spec/unit/deployment/source_spec.rb +0 -24
- data/spec/unit/module/metadata_spec.rb +0 -68
- data/spec/unit/util/core_ext/hash_ext_spec.rb +0 -63
@@ -0,0 +1,22 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
test_name 'CODEMGMT-90 - C63462 - Specify Invalid Command-line Environment Flag'
|
5
|
+
|
6
|
+
#Init
|
7
|
+
git_environments_path = '/root/environments'
|
8
|
+
last_commit = git_last_commit(master, git_environments_path)
|
9
|
+
|
10
|
+
#Verification
|
11
|
+
error_message_regex = /environment: illegal option/
|
12
|
+
|
13
|
+
#Teardown
|
14
|
+
teardown do
|
15
|
+
clean_up_r10k(master, last_commit, git_environments_path)
|
16
|
+
end
|
17
|
+
|
18
|
+
#Tests
|
19
|
+
step 'Attempt to Deploy via r10k'
|
20
|
+
on(master, 'r10k deploy environment -x', :acceptable_exit_codes => 1) do |result|
|
21
|
+
assert_match(error_message_regex, result.stderr, 'Expected message not found!')
|
22
|
+
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
test_name 'CODEMGMT-90 - C62420 - Invalid Command Line Argument'
|
5
|
+
|
6
|
+
#Init
|
7
|
+
git_environments_path = '/root/environments'
|
8
|
+
last_commit = git_last_commit(master, git_environments_path)
|
9
|
+
|
10
|
+
#Verification
|
11
|
+
error_message_regex = /error/
|
12
|
+
|
13
|
+
#Teardown
|
14
|
+
teardown do
|
15
|
+
clean_up_r10k(master, last_commit, git_environments_path)
|
16
|
+
end
|
17
|
+
|
18
|
+
#Tests
|
19
|
+
step 'Attempt to Deploy via r10k'
|
20
|
+
on(master, 'r10k deploy environment NONEXISTENTENV -v', :acceptable_exit_codes => [0, 1, 2]) do |result|
|
21
|
+
expect_failure('expected to fail due to RK-21') do
|
22
|
+
assert_match(/error/, result.stderr.downcase, 'Expected message not found!')
|
23
|
+
end
|
24
|
+
end
|
@@ -0,0 +1,123 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
test_name 'CODEMGMT-92 - C59235 - Single Git Source Using "GIT" Transport Protocol'
|
5
|
+
|
6
|
+
confine(:to, :platform => 'el')
|
7
|
+
|
8
|
+
if fact_on(master, "operatingsystemmajrelease").to_i < 6
|
9
|
+
skip_test('This version of EL is not supported by this test case!')
|
10
|
+
end
|
11
|
+
|
12
|
+
#Init
|
13
|
+
master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
|
14
|
+
env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
|
15
|
+
|
16
|
+
git_control_remote = 'git://localhost/environments.git'
|
17
|
+
git_environments_path = '/root/environments'
|
18
|
+
git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
|
19
|
+
last_commit = git_last_commit(master, git_environments_path)
|
20
|
+
|
21
|
+
local_files_root_path = ENV['FILES'] || 'files'
|
22
|
+
helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
|
23
|
+
|
24
|
+
r10k_config_path = get_r10k_config_file_path(master)
|
25
|
+
r10k_config_bak_path = "#{r10k_config_path}.bak"
|
26
|
+
|
27
|
+
#Manifest
|
28
|
+
site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
|
29
|
+
site_pp = create_site_pp(master_certname, ' include helloworld')
|
30
|
+
|
31
|
+
#In-line files
|
32
|
+
r10k_conf = <<-CONF
|
33
|
+
cachedir: '/var/cache/r10k'
|
34
|
+
git:
|
35
|
+
provider: '#{git_provider}'
|
36
|
+
sources:
|
37
|
+
broken:
|
38
|
+
basedir: "#{env_path}"
|
39
|
+
remote: "#{git_control_remote}"
|
40
|
+
CONF
|
41
|
+
|
42
|
+
git_daemon_xinetd_enable_manifest = <<-MANIFEST
|
43
|
+
package { 'git-daemon':
|
44
|
+
ensure => present
|
45
|
+
}
|
46
|
+
include xinetd
|
47
|
+
xinetd::service { 'git-daemon':
|
48
|
+
port => '9418',
|
49
|
+
server => '/usr/libexec/git-core/git-daemon',
|
50
|
+
server_args => '--inetd --verbose --syslog --export-all --base-path=/git_repos',
|
51
|
+
socket_type => 'stream',
|
52
|
+
user => 'nobody',
|
53
|
+
wait => 'no',
|
54
|
+
service_type => 'UNLISTED',
|
55
|
+
disable => 'no'
|
56
|
+
}
|
57
|
+
MANIFEST
|
58
|
+
|
59
|
+
git_daemon_xinetd_disable_manifest = <<-MANIFEST
|
60
|
+
xinetd::service { 'git-daemon':
|
61
|
+
port => '9418',
|
62
|
+
server => '/usr/libexec/git-core/git-daemon',
|
63
|
+
disable => 'yes'
|
64
|
+
}
|
65
|
+
MANIFEST
|
66
|
+
|
67
|
+
#Verification
|
68
|
+
notify_message_regex = /I am in the production environment/
|
69
|
+
|
70
|
+
#Teardown
|
71
|
+
teardown do
|
72
|
+
step 'Restore Original "r10k" Config'
|
73
|
+
on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
|
74
|
+
|
75
|
+
step 'Stop "xinetd" Service'
|
76
|
+
on(master, puppet('apply'), :stdin => git_daemon_xinetd_disable_manifest)
|
77
|
+
on(master, puppet('resource', 'service', 'xinetd', 'ensure=stopped'))
|
78
|
+
|
79
|
+
clean_up_r10k(master, last_commit, git_environments_path)
|
80
|
+
|
81
|
+
step 'Run Puppet Agent to Clear Plug-in Cache'
|
82
|
+
on(agents, puppet('agent', '--test', '--environment production'))
|
83
|
+
end
|
84
|
+
|
85
|
+
#Setup
|
86
|
+
step 'Stub Forge on Master'
|
87
|
+
stub_forge_on(master)
|
88
|
+
|
89
|
+
step 'Backup Current "r10k" Config'
|
90
|
+
on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
|
91
|
+
|
92
|
+
step 'Update the "r10k" Config'
|
93
|
+
create_remote_file(master, r10k_config_path, r10k_conf)
|
94
|
+
|
95
|
+
step 'Install "puppetlabs-xinetd" Module'
|
96
|
+
on(master, puppet('module install puppetlabs-xinetd'))
|
97
|
+
|
98
|
+
step 'Install and Configure "git-daemon" service'
|
99
|
+
on(master, puppet('apply'), :stdin => git_daemon_xinetd_enable_manifest)
|
100
|
+
|
101
|
+
step 'Checkout "production" Branch'
|
102
|
+
git_on(master, 'checkout production', git_environments_path)
|
103
|
+
|
104
|
+
step 'Copy "helloworld" Module to "production" Environment Git Repo'
|
105
|
+
scp_to(master, helloworld_module_path, File.join(git_environments_path, "site", 'helloworld'))
|
106
|
+
|
107
|
+
step 'Inject New "site.pp" to the "production" Environment'
|
108
|
+
inject_site_pp(master, site_pp_path, site_pp)
|
109
|
+
|
110
|
+
step 'Push Changes'
|
111
|
+
git_add_commit_push(master, 'production', 'Update site.pp and add module.', git_environments_path)
|
112
|
+
|
113
|
+
#Tests
|
114
|
+
step 'Deploy "production" Environment via r10k'
|
115
|
+
on(master, 'r10k deploy environment -v')
|
116
|
+
|
117
|
+
agents.each do |agent|
|
118
|
+
step "Run Puppet Agent"
|
119
|
+
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
120
|
+
assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
121
|
+
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
122
|
+
end
|
123
|
+
end
|
@@ -0,0 +1,84 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
test_name 'CODEMGMT-92 - C59234 - Single Git Source Using "SSH" Transport Protocol'
|
5
|
+
|
6
|
+
#Init
|
7
|
+
env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
|
8
|
+
git_control_remote = 'git@github.com:puppetlabs/codemgmt-92.git'
|
9
|
+
git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
|
10
|
+
|
11
|
+
jenkins_key_path = File.file?('/var/lib/jenkins/.ssh/id_rsa-jenkins') ? '/var/lib/jenkins/.ssh/id_rsa-jenkins' : File.expand_path('~/.ssh/id_rsa-jenkins')
|
12
|
+
ssh_private_key_path = '/root/.ssh/id_rsa-jenkins'
|
13
|
+
ssh_config_path = '/root/.ssh/config'
|
14
|
+
|
15
|
+
r10k_config_path = get_r10k_config_file_path(master)
|
16
|
+
r10k_config_bak_path = "#{r10k_config_path}.bak"
|
17
|
+
|
18
|
+
#In-line files
|
19
|
+
r10k_conf = <<-CONF
|
20
|
+
cachedir: '/var/cache/r10k'
|
21
|
+
git:
|
22
|
+
provider: '#{git_provider}'
|
23
|
+
private_key: '#{ssh_private_key_path}'
|
24
|
+
sources:
|
25
|
+
broken:
|
26
|
+
basedir: "#{env_path}"
|
27
|
+
remote: "#{git_control_remote}"
|
28
|
+
CONF
|
29
|
+
|
30
|
+
ssh_config = <<-CONF
|
31
|
+
StrictHostKeyChecking no
|
32
|
+
|
33
|
+
Host github.com
|
34
|
+
IdentityFile #{ssh_private_key_path}
|
35
|
+
CONF
|
36
|
+
|
37
|
+
#Verification
|
38
|
+
notify_message_regex = /I am in the production environment/
|
39
|
+
|
40
|
+
#Teardown
|
41
|
+
teardown do
|
42
|
+
step 'Restore Original "r10k" Config'
|
43
|
+
on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
|
44
|
+
|
45
|
+
step 'Remove Jenkins SSH Key'
|
46
|
+
on(master, "rm -rf #{ssh_private_key_path}")
|
47
|
+
|
48
|
+
step 'Remove SSH Config'
|
49
|
+
on(master, "rm -rf #{ssh_config_path}")
|
50
|
+
|
51
|
+
step 'Restore Original "production" Environment via r10k'
|
52
|
+
on(master, 'r10k deploy environment -v')
|
53
|
+
end
|
54
|
+
|
55
|
+
#Setup
|
56
|
+
step 'Backup Current "r10k" Config'
|
57
|
+
on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
|
58
|
+
|
59
|
+
if File.file?(jenkins_key_path) == false
|
60
|
+
skip_test('Skipping test because necessary SSH key is not present!')
|
61
|
+
end
|
62
|
+
|
63
|
+
step 'Update the "r10k" Config'
|
64
|
+
create_remote_file(master, r10k_config_path, r10k_conf)
|
65
|
+
|
66
|
+
step 'Configure SSH to Use SSH Key for "github.com"'
|
67
|
+
create_remote_file(master, ssh_config_path, ssh_config)
|
68
|
+
on(master, "chmod 600 #{ssh_config_path}")
|
69
|
+
|
70
|
+
step 'Copy SSH Key to Master'
|
71
|
+
scp_to(master, jenkins_key_path, ssh_private_key_path)
|
72
|
+
on(master, "chmod 600 #{ssh_private_key_path}")
|
73
|
+
|
74
|
+
#Tests
|
75
|
+
step 'Deploy "production" Environment via r10k'
|
76
|
+
on(master, 'r10k deploy environment -v')
|
77
|
+
|
78
|
+
agents.each do |agent|
|
79
|
+
step "Run Puppet Agent"
|
80
|
+
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 2) do |result|
|
81
|
+
assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
82
|
+
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
83
|
+
end
|
84
|
+
end
|
@@ -0,0 +1,69 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
test_name 'CODEMGMT-92 - C59238 - Single Git Source with Git Sub-module'
|
5
|
+
|
6
|
+
#Init
|
7
|
+
master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
|
8
|
+
|
9
|
+
git_repo_module_parent_path = '/git_repos'
|
10
|
+
git_repo_module_name = 'helloworld'
|
11
|
+
git_repo_module_path = File.join(git_repo_module_parent_path, "#{git_repo_module_name}.git")
|
12
|
+
git_clone_module_path = '/root/helloworld_module'
|
13
|
+
git_environments_path = '/root/environments'
|
14
|
+
last_commit = git_last_commit(master, git_environments_path)
|
15
|
+
|
16
|
+
local_files_root_path = ENV['FILES'] || 'files'
|
17
|
+
helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld')
|
18
|
+
|
19
|
+
#Manifest
|
20
|
+
site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
|
21
|
+
site_pp = create_site_pp(master_certname, ' include helloworld')
|
22
|
+
|
23
|
+
#Verification
|
24
|
+
notify_message_regex = /I am in the production environment/
|
25
|
+
|
26
|
+
#Teardown
|
27
|
+
teardown do
|
28
|
+
'Remove "helloworld" Git Repo'
|
29
|
+
on(master, "rm -rf #{git_repo_module_path}")
|
30
|
+
|
31
|
+
'Remove "helloworld" Git Clone'
|
32
|
+
on(master, "rm -rf #{git_clone_module_path}")
|
33
|
+
|
34
|
+
clean_up_r10k(master, last_commit, git_environments_path)
|
35
|
+
end
|
36
|
+
|
37
|
+
#Setup
|
38
|
+
step 'Create Git Repo for "helloworld" Module'
|
39
|
+
git_init_bare_repo_and_clone(master, git_repo_module_parent_path, git_repo_module_name, git_clone_module_path)
|
40
|
+
|
41
|
+
step 'Copy "helloworld" Module to Git Repo'
|
42
|
+
scp_to(master, helloworld_module_path, File.join(git_clone_module_path, 'helloworld'))
|
43
|
+
git_add_commit_push(master, 'master', 'Add module.', git_clone_module_path)
|
44
|
+
|
45
|
+
step 'Add "helloworld" Module Git Repo as Submodule'
|
46
|
+
on(master, "cd #{git_environments_path};git submodule add file://#{git_repo_module_path} dist")
|
47
|
+
|
48
|
+
step 'Checkout "production" Branch'
|
49
|
+
git_on(master, 'checkout production', git_environments_path)
|
50
|
+
|
51
|
+
step 'Inject New "site.pp" to the "production" Environment'
|
52
|
+
inject_site_pp(master, site_pp_path, site_pp)
|
53
|
+
|
54
|
+
step 'Push Changes'
|
55
|
+
git_add_commit_push(master, 'production', 'Update site.pp.', git_environments_path)
|
56
|
+
|
57
|
+
#Tests
|
58
|
+
step 'Deploy "production" Environment via r10k'
|
59
|
+
on(master, 'r10k deploy environment -v')
|
60
|
+
|
61
|
+
agents.each do |agent|
|
62
|
+
step "Run Puppet Agent"
|
63
|
+
on(agent, puppet('agent', '--test', '--environment production'), :acceptable_exit_codes => 1) do |result|
|
64
|
+
expect_failure('Expected to fail due to RK-30') do
|
65
|
+
assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
|
66
|
+
assert_match(notify_message_regex, result.stdout, 'Expected message not found!')
|
67
|
+
end
|
68
|
+
end
|
69
|
+
end
|
@@ -0,0 +1,37 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
require 'digest/sha1'
|
5
|
+
test_name 'CODEMGMT-101 - C59261 - Attempt to Deploy Environment with Broken Git Remote'
|
6
|
+
|
7
|
+
#Init
|
8
|
+
git_control_remote = '/git_repos/environments.git'
|
9
|
+
prod_branch_head_ref_path = File.join(git_control_remote, 'refs', 'heads', 'production')
|
10
|
+
prod_branch_head_ref_path_backup = '/tmp/production.bak'
|
11
|
+
|
12
|
+
invalid_sha_ref = Digest::SHA1.hexdigest('broken')
|
13
|
+
|
14
|
+
#Verification
|
15
|
+
error_message_regex = /ERROR\].*Blah/m
|
16
|
+
|
17
|
+
#Teardown
|
18
|
+
teardown do
|
19
|
+
step 'Restore Original "production" Branch Head Ref'
|
20
|
+
on(master, "mv #{prod_branch_head_ref_path_backup} #{prod_branch_head_ref_path}")
|
21
|
+
end
|
22
|
+
|
23
|
+
#Setup
|
24
|
+
step 'Backup Current "production" Branch Head Ref'
|
25
|
+
on(master, "mv #{prod_branch_head_ref_path} #{prod_branch_head_ref_path_backup}")
|
26
|
+
|
27
|
+
step 'Inject Corrupt "production" Branch Head Ref'
|
28
|
+
create_remote_file(master, prod_branch_head_ref_path, "#{invalid_sha_ref}\n")
|
29
|
+
on(master, "chmod 644 #{prod_branch_head_ref_path}")
|
30
|
+
|
31
|
+
#Tests
|
32
|
+
step 'Attempt to Deploy via r10k'
|
33
|
+
on(master, 'r10k deploy environment -v -t', :acceptable_exit_codes => [0,1]) do |result|
|
34
|
+
expect_failure('Expected to fail due to RK-28') do
|
35
|
+
assert_match(error_message_regex, result.stderr, 'Expected message not found!')
|
36
|
+
end
|
37
|
+
end
|
@@ -0,0 +1,45 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
test_name 'CODEMGMT-101 - C59236 - Attempt to Deploy Environment with Unauthorized "HTTPS" Git Source'
|
5
|
+
|
6
|
+
#Init
|
7
|
+
env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
|
8
|
+
git_control_remote = 'https://bad:user@github.com/puppetlabs/codemgmt-92.git'
|
9
|
+
git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
|
10
|
+
|
11
|
+
r10k_config_path = get_r10k_config_file_path(master)
|
12
|
+
r10k_config_bak_path = "#{r10k_config_path}.bak"
|
13
|
+
|
14
|
+
#In-line files
|
15
|
+
r10k_conf = <<-CONF
|
16
|
+
cachedir: '/var/cache/r10k'
|
17
|
+
git:
|
18
|
+
provider: '#{git_provider}'
|
19
|
+
sources:
|
20
|
+
broken:
|
21
|
+
basedir: "#{env_path}"
|
22
|
+
remote: "#{git_control_remote}"
|
23
|
+
CONF
|
24
|
+
|
25
|
+
#Verification
|
26
|
+
error_message_regex = /ERROR\]/m
|
27
|
+
|
28
|
+
#Teardown
|
29
|
+
teardown do
|
30
|
+
step 'Restore Original "r10k" Config'
|
31
|
+
on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
|
32
|
+
end
|
33
|
+
|
34
|
+
#Setup
|
35
|
+
step 'Backup Current "r10k" Config'
|
36
|
+
on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
|
37
|
+
|
38
|
+
step 'Update the "r10k" Config'
|
39
|
+
create_remote_file(master, r10k_config_path, r10k_conf)
|
40
|
+
|
41
|
+
#Tests
|
42
|
+
step 'Attempt to Deploy via r10k'
|
43
|
+
on(master, 'r10k deploy environment -v', :acceptable_exit_codes => 1) do |result|
|
44
|
+
assert_match(error_message_regex, result.stderr, 'Expected message not found!')
|
45
|
+
end
|
@@ -0,0 +1,72 @@
|
|
1
|
+
require 'git_utils'
|
2
|
+
require 'r10k_utils'
|
3
|
+
require 'master_manipulator'
|
4
|
+
require 'openssl'
|
5
|
+
test_name 'CODEMGMT-101 - C59237 - Attempt to Deploy Environment with Unauthorized "SSH" Git Source'
|
6
|
+
|
7
|
+
#Init
|
8
|
+
env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
|
9
|
+
git_control_remote = 'git@github.com:puppetlabs/codemgmt-92.git'
|
10
|
+
git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
|
11
|
+
|
12
|
+
unauthorized_rsa_key = OpenSSL::PKey::RSA.new(2048)
|
13
|
+
ssh_private_key_path = '/root/.ssh/unauthorized_key'
|
14
|
+
ssh_config_path = '/root/.ssh/config'
|
15
|
+
|
16
|
+
r10k_config_path = get_r10k_config_file_path(master)
|
17
|
+
r10k_config_bak_path = "#{r10k_config_path}.bak"
|
18
|
+
|
19
|
+
#In-line files
|
20
|
+
r10k_conf = <<-CONF
|
21
|
+
cachedir: '/var/cache/r10k'
|
22
|
+
git:
|
23
|
+
provider: '#{git_provider}'
|
24
|
+
private_key: '#{ssh_private_key_path}'
|
25
|
+
sources:
|
26
|
+
broken:
|
27
|
+
basedir: "#{env_path}"
|
28
|
+
remote: "#{git_control_remote}"
|
29
|
+
CONF
|
30
|
+
|
31
|
+
ssh_config = <<-CONF
|
32
|
+
StrictHostKeyChecking no
|
33
|
+
|
34
|
+
Host github.com
|
35
|
+
IdentityFile #{ssh_private_key_path}
|
36
|
+
CONF
|
37
|
+
|
38
|
+
#Verification
|
39
|
+
error_message_regex = /ERROR\].*Permission denied/m
|
40
|
+
|
41
|
+
#Teardown
|
42
|
+
teardown do
|
43
|
+
step 'Restore Original "r10k" Config'
|
44
|
+
on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
|
45
|
+
|
46
|
+
step 'Remove Unauthorized SSH Key'
|
47
|
+
on(master, "rm -rf #{ssh_private_key_path}")
|
48
|
+
|
49
|
+
step 'Remove SSH Config'
|
50
|
+
on(master, "rm -rf #{ssh_config_path}")
|
51
|
+
end
|
52
|
+
|
53
|
+
#Setup
|
54
|
+
step 'Backup Current "r10k" Config'
|
55
|
+
on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
|
56
|
+
|
57
|
+
step 'Update the "r10k" Config'
|
58
|
+
create_remote_file(master, r10k_config_path, r10k_conf)
|
59
|
+
|
60
|
+
step 'Copy Unauthorized SSH Key to Master'
|
61
|
+
create_remote_file(master, ssh_config_path, ssh_config)
|
62
|
+
on(master, "chmod 600 #{ssh_config_path}")
|
63
|
+
|
64
|
+
step 'Configure SSH to Use Unauthorized SSH Key for "github.com"'
|
65
|
+
create_remote_file(master, ssh_private_key_path, unauthorized_rsa_key)
|
66
|
+
on(master, "chmod 600 #{ssh_private_key_path}")
|
67
|
+
|
68
|
+
#Tests
|
69
|
+
step 'Attempt to Deploy via r10k'
|
70
|
+
on(master, 'r10k deploy environment -v', :acceptable_exit_codes => 1) do |result|
|
71
|
+
assert_match(error_message_regex, result.stderr, 'Expected message not found!')
|
72
|
+
end
|