r10k 2.6.3 → 2.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 181e280a63e21a47dd182183bbfbed9d8b7cb624
-  data.tar.gz: 67dd254d0ad0c7404a07953e8813260ee8078541
+  metadata.gz: 57e5c32f14eddc3386bb26d91697fcce47f1a3bc
+  data.tar.gz: 94d053fc19eb6cc38561571193e05a205613a444
 SHA512:
-  metadata.gz: 90efcc7e2a7122ad759cc67d1caf135d6dad8a605e9d9bca382b92e39d43aad768e7015c587c413a7b10e7d7b73fb56e084ae220662aded12be02ce3b1d8c34c
-  data.tar.gz: e6ce307498e65fe437deea1950c32bd2705058ae61483140aa03b0379845ae110347123542594957d6b509ff3011f880386f323c6ecc4d84d7b70beb062a836d
+  metadata.gz: abb8f5c18eff9074b2b66c2121cd3b74d5205536a78e9bfe8e50afd0c3fd02e34cbcee16e03a30e601bfa05af63b40163373a5970712accda38d43cee542a527
+  data.tar.gz: 4b4238d221dd262c5b86c939b228221e01989fbfc8bbe88bd1eda0afd0d7792e9de1548729730fa90031bc68498dc827e7cbd9b75af52cb8d1c2c37088a5a9a8

data/.gitignore

@@ -5,3 +5,6 @@ Gemfile.lock
 bundle
 coverage
 locales/r10k.pot
+integration/log
+integration/junit
+integration/configs

data/integration/Gemfile

@@ -1,6 +1,17 @@
 source ENV['GEM_SOURCE'] || 'https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/'
 
-gem 'beaker', '~> 2.7'
-gem 'beaker-abs', '~> 0.2'
+def location_for(place, fake_version = nil)
+  if place =~ /^(git:[^#]*)#(.*)/
+    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
+  elsif place =~ /^file:\/\/(.*)/
+    ['>= 0', { :path => File.expand_path($1), :require => false }]
+  else
+    [place, { :require => false }]
+  end
+end
+
+gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 3.33')
+gem 'beaker-pe', '~> 1.22'
+gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || '~> 1.1')
+gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.4')
 gem 'rototiller', '= 0.1.0'
-gem 'beaker-hostgenerator', '~> 0.7.0'

data/integration/component/pre-suite/05_install_dev_r10k.rb

@@ -1,10 +1,12 @@
 test_name "Install PE r10k" do
 
   step "Install PE r10k" do
+    variant, version, arch, codename = master['platform'].to_array
+    if variant == 'ubuntu' && version.split('.').first.to_i >= 18
+      on master, "echo 'Acquire::AllowInsecureRepositories \"true\";' > /etc/apt/apt.conf.d/90insecure"
+    end
 
-    # taken from beaker-pe/lib/beaker-pe/pe-client-tools/install_helper.rb
     install_dev_repos_on('pe-r10k', master, ENV['SHA'], '/tmp/repo_configs', {:dev_builds_url => 'http://builds.delivery.puppetlabs.net'})
     master.install_package('pe-r10k')
-
   end
 end

data/integration/pre-suite/30_test_utils.rb

@@ -11,7 +11,7 @@ SCRIPT
 
 step 'Install "filebucket" File Generator'
 create_remote_file(master, filebucket_script_path, filebucket_script)
-on(master, "git clone https://github.com/cowofevil/filebucket.git #{filebucket_path}")
+on(master, "git clone git://github.com/puppetlabs/filebucket.git #{filebucket_path}")
 
 on(master, "chmod 755 #{filebucket_script_path}")
 on(master, "chmod 755 #{filebucket_path}/filebucketapp.py")

data/integration/tests/Puppetfile/{HTTP_PROXY_effects_forge_source.rb → HTTP_PROXY_affects_forge_source.rb}

@@ -1,7 +1,7 @@
 require 'git_utils'
 require 'r10k_utils'
 require 'master_manipulator'
-test_name 'CODEMGMT-730 - C97981 - HTTP_PROXY effects git source in puppetfile'
+test_name 'CODEMGMT-730 - C97981 - HTTP_PROXY affects git source in puppetfile'
 
 #Init
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip

data/integration/tests/Puppetfile/{HTTP_PROXY_effects_git_source.rb → HTTP_PROXY_affects_git_source.rb}

@@ -1,7 +1,7 @@
 require 'git_utils'
 require 'r10k_utils'
 require 'master_manipulator'
-test_name 'CODEMGMT-730 - C97982 - HTTP_PROXY effects git source in puppetfile'
+test_name 'CODEMGMT-730 - C97982 - HTTP_PROXY affects git source in puppetfile'
 
 #Init
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip

data/integration/tests/git_source/HTTP_proxy_and_git_source.rb

@@ -16,7 +16,7 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 puppetfile =<<-EOS
 mod 'motd',
-  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
+  :git    => 'git://github.com/puppetlabs/puppetlabs-motd'
 EOS
 
 proxy_env_value = 'http://cattastic.net:3219'

data/integration/tests/purging/content_not_purged_at_root.rb

@@ -30,12 +30,12 @@ CONF
 puppetfile = <<-EOS
 mod 'non_module_object_1',
   :install_path => './',
-  :git => 'https://github.com/puppetlabs/control-repo.git',
+  :git => 'git://github.com/puppetlabs/control-repo.git',
   :branch => 'production'
 
 mod 'non_module_object_2',
  :install_path => '',
- :git => 'https://github.com/puppetlabs/control-repo.git',
+ :git => 'git://github.com/puppetlabs/control-repo.git',
   :branch => 'production'
 EOS
 

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

@@ -27,7 +27,7 @@ stdlib_notify_message_regex = /The test message is:.*one.*=>.*1.*two.*=>.*bats.*
 puppet_file = <<-PUPPETFILE
 mod "puppetlabs/motd"
 mod 'puppetlabs/stdlib',
-  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
 PUPPETFILE
 
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')

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

@@ -31,7 +31,7 @@ puppet_file = <<-PUPPETFILE
 moduledir '#{@module_path}'
 mod "puppetlabs/motd"
 mod 'puppetlabs/stdlib',
-  :git => 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+  :git => 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
 PUPPETFILE
 
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')

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

@@ -65,7 +65,7 @@ env_structs = {:production => GitEnv.new('/git_repos',
                                          '/git_repos_alt/environments_alt.git',
                                          '/root/environments_alt',
                                          '/root/environments_alt/Puppetfile',
-                                         'mod "puppetlabs/stdlib", :git => "https://github.com/puppetlabs/puppetlabs-stdlib.git"',
+                                         'mod "puppetlabs/stdlib", :git => "git://github.com/puppetlabs/puppetlabs-stdlib.git"',
                                          '/root/environments_alt/manifests/site.pp',
                                          create_site_pp(master_certname, stage_env_manifest)
                                         ),

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module.rb

@@ -15,7 +15,7 @@ r10k_fqp = get_r10k_fqp(master)
 
 #File
 puppet_file = <<-PUPPETFILE
-mod 'broken', :git => 'https://github.com/puppetlabs/puppetlabs-broken'
+mod 'broken', :git => 'git://github.com/puppetlabs/puppetlabs-broken'
 PUPPETFILE
 
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')

data/integration/tests/user_scenario/basic_workflow/negative/neg_bad_git_module_ref.rb

@@ -12,7 +12,7 @@ r10k_fqp = get_r10k_fqp(master)
 #File
 puppet_file = <<-PUPPETFILE
 mod 'broken',
-  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
+  :git => 'git://github.com/puppetlabs/puppetlabs-motd',
   :ref => 'does_not_exist'
 PUPPETFILE
 

data/integration/tests/user_scenario/basic_workflow/negative/neg_disk_full.rb

@@ -20,8 +20,15 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 tmpfs_path = '/mnt/tmpfs'
 
+if on(master, 'which python', :acceptable_exit_codes => [0, 1]).exit_code == 1
+    python_bin = 'python3'
+else
+    python_bin = 'python'
+end
+
 file_bucket_path = '/opt/filebucket'
 file_bucket_command_path = File.join(file_bucket_path, 'filebucketapp.py')
+file_bucket_command = "#{python_bin} #{file_bucket_command_path}"
 pattern_file_path = File.join(file_bucket_path, 'psuedo_random_128k.pat')
 
 test_files_path = File.join(git_environments_path, 'test_files')
@@ -66,7 +73,7 @@ on(master, "mount -osize=10m tmpfs #{tmpfs_path} -t tmpfs")
 step 'Create Large Binary File'
 create_remote_file(master, File.join(git_environments_path, '.gitattributes'), '*.file binary')
 on(master, "mkdir -p #{test_files_path}")
-on(master, "#{file_bucket_command_path} -s 11 -f #{test_files_path}/test.file -d #{pattern_file_path}")
+on(master, "#{file_bucket_command} -s 11 -f #{test_files_path}/test.file -d #{pattern_file_path}")
 
 step 'Push Changes'
 git_add_commit_push(master, 'production', 'Add large file.', git_environments_path)

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

@@ -21,9 +21,15 @@ helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld
 test_files = 'test_files'
 test_files_path = File.join(git_environments_path, test_files)
 
+if on(master, 'which python', :acceptable_exit_codes => [0, 1]).exit_code == 1
+  python_bin = 'python3'
+else
+  python_bin = 'python'
+end
+
 file_bucket_path = '/opt/filebucket'
 file_bucket_command_path = File.join(file_bucket_path, 'filebucketapp.py')
-pattern_file_path = File.join(file_bucket_path, 'psuedo_random_128k.pat')
+file_bucket_command = "#{python_bin} #{file_bucket_command_path}"
 
 #Manifest
 site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
@@ -54,7 +60,7 @@ inject_site_pp(master, site_pp_path, site_pp)
 step 'Create 10,000 Files'
 create_remote_file(master, File.join(git_environments_path, '.gitattributes'), '*.file binary')
 on(master, "mkdir -p #{test_files_path}")
-on(master, "#{file_bucket_command_path} -k -c 10000 -p #{test_files_path}/test -u .file")
+on(master, "#{file_bucket_command} -k -c 10000 -p #{test_files_path}/test -u .file")
 
 step 'Create MD5 Checksum of Files'
 on(master, "cd #{test_files_path};md5sum *.file > #{checksum_file_name}")

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

@@ -28,7 +28,7 @@ notify_message_regex = /I am in the production environment/
 puppet_file = <<-PUPPETFILE
 mod "puppetlabs/motd"
 mod 'puppetlabs/inifile',
-  :git => 'https://github.com/puppetlabs/puppetlabs-inifile'
+  :git => 'git://github.com/puppetlabs/puppetlabs-inifile'
 PUPPETFILE
 
 puppet_file_path = File.join(git_environments_path, 'Puppetfile')

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

@@ -21,9 +21,16 @@ helloworld_module_path = File.join(local_files_root_path, 'modules', 'helloworld
 test_files = 'test_files'
 test_files_path = File.join(git_environments_path, 'test_files')
 
+if on(master, 'which python', :acceptable_exit_codes => [0, 1]).exit_code == 1
+  python_bin = 'python3'
+else
+  python_bin = 'python'
+end
+
 file_bucket_path = '/opt/filebucket'
 file_bucket_command_path = File.join(file_bucket_path, 'filebucketapp.py')
 pattern_file_path = File.join(file_bucket_path, 'psuedo_random_128k.pat')
+file_bucket_command = "#{python_bin} #{file_bucket_command_path}"
 
 #Manifest
 site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
@@ -54,7 +61,7 @@ inject_site_pp(master, site_pp_path, site_pp)
 step 'Create Large Binary Files'
 create_remote_file(master, File.join(git_environments_path, '.gitattributes'), '*.file binary')
 on(master, "mkdir -p #{test_files_path}")
-on(master, "#{file_bucket_command_path} -c 10 -s 25 -p #{test_files_path}/test -u .file -d #{pattern_file_path}")
+on(master, "#{file_bucket_command} -c 10 -s 25 -p #{test_files_path}/test -u .file -d #{pattern_file_path}")
 
 step 'Create MD5 Checksum of Files'
 on(master, "cd #{test_files_path};md5sum *.file > #{checksum_file_name}")

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

@@ -27,7 +27,7 @@ PUPPETFILE
 
 puppet_file_git = <<-PUPPETFILE
 mod "puppetlabs/motd",
-  :git => 'https://github.com/puppetlabs/puppetlabs-motd',
+  :git => 'git://github.com/puppetlabs/puppetlabs-motd',
   :tag => '1.2.0'
 PUPPETFILE
 

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '2.6.3'
+  VERSION = '2.6.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 2.6.3
+  version: 2.6.4
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -217,8 +217,8 @@ files:
 - integration/scripts/setup_r10k_env_ubuntu1004.sh
 - integration/scripts/setup_r10k_env_ubuntu1204.sh
 - integration/scripts/setup_r10k_env_ubuntu1404.sh
-- integration/tests/Puppetfile/HTTP_PROXY_effects_forge_source.rb
-- integration/tests/Puppetfile/HTTP_PROXY_effects_git_source.rb
+- integration/tests/Puppetfile/HTTP_PROXY_affects_forge_source.rb
+- integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
 - integration/tests/README.mkd
 - integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb
 - integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb