r10k 2.6.9 → 3.0.0

data/integration/Gemfile

@@ -10,8 +10,10 @@ def location_for(place, fake_version = nil)
   end
 end
 
-gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.5')
-gem 'beaker-pe', '~> 2.0'
+gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 3.33')
+gem 'beaker-pe', '~> 1.22'
+gem 'beaker-answers'
 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-qa-i18n'

data/integration/Rakefile

@@ -24,6 +24,7 @@ pre-suite/00_pe_install.rb,
 component/pre-suite/05_install_dev_r10k.rb,
 pre-suite/10_git_config.rb,
 pre-suite/20_pe_r10k.rb,
+pre-suite/30_test_utils.rb,
 EOS
   common_setup.gsub!("\n", '')
 
@@ -44,8 +45,8 @@ EOS
 
   t.add_env do |env|
     env.name = 'pe_dist_dir'
-    env.message = 'The location to download PE from, for example "https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/20XX.X/ci-ready"'
-    ENV['pe_dist_dir'] ||= "https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local/#{ENV['PE_FAMILY']}/ci-ready"
+    env.message = 'The location to download PE from example "http://enterprise.delivery.puppetlabs.net/20XX.X/ci-ready"'
+    ENV['pe_dist_dir'] ||= "http://enterprise.delivery.puppetlabs.net/#{ENV['PE_FAMILY']}/ci-ready"
   end
 
   t.add_env do |env|

data/integration/pre-suite/00_pe_install.rb

@@ -1,5 +1,4 @@
 require 'beaker-pe'
-
 test_name 'CODEMGMT-20 - C48 - Install Puppet Enterprise'
 
 step 'Install PE'

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

@@ -0,0 +1,17 @@
+test_name 'CODEMGMT-62 - C63199 - Install Utilities for r10k Integration Testing'
+
+#Init
+filebucket_path = '/opt/filebucket'
+filebucket_script_path = '/etc/profile.d/filebucket_path.sh'
+
+filebucket_script = <<-SCRIPT
+#!/bin/bash
+export PATH="${PATH}:#{filebucket_path}"
+SCRIPT
+
+step 'Install "filebucket" File Generator'
+create_remote_file(master, filebucket_script_path, filebucket_script)
+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/scripts/README.mkd

@@ -0,0 +1,86 @@
+Scripts
+=======
+
+This folder contains helper scripts for setting up manual testing environments
+using [Beaker](https://github.com/puppetlabs/beaker) configuration files. The
+environments created by these scripts have "r10k" fully configured along with
+a Git repository with a valid "production" environment.
+
+These scripts are specific to the Puppet Labs environment and will not work in
+other environments without alteration!
+
+## Prerequisites
+
+To utilize this test scripts you will need to have Ruby 1.9.3 or greater
+installed on your system along with Bundler. Also, the scripts utilize the
+"vmpooler" for virtual machine creation. Access to the "vmpooler" machines
+require having valid SSH private keys located on your local computer. Speak
+with a QA team member for more information on where to find the necessary
+SSH keys.
+
+## Usage
+
+The scripts are written in Bash and should run on any Linux or Mac system as
+long as the prerequisites mentioned above are satisfied.
+
+### Cloning
+
+First you will need to clone the "[r10k](https://github.com/puppetlabs/r10k)" repository on your local machine:
+
+```bash
+git clone git@github.com:puppetlabs/r10k.git
+```
+
+### Executing Script
+
+Navigate to the integration tests "scripts" folder of the "r10k" repository
+clone:
+
+```bash
+cd r10k/integration/scripts
+```
+
+There are separate scripts for each supported platform. Select a desired
+platform and execute the script:
+
+```bash
+bash setup_r10k_env_centos6.sh
+```
+
+## Connecting to Machines
+
+The setup process takes about 10 minutes to complete. Once finished Beaker
+will report that all tests have been run successfully. The output log will
+list the machines created. The Puppet master will have a name ending with
+"-master" which you can scrape from the Beaker console output. Example:
+
+```
+a9lrs93vnujsrrg.delivery.puppetlabs.net (centos-6-x86_64-master) executed in 1.26 seconds
+```
+
+The FQDN of the Puppet master ("a9lrs93vnujsrrg.delivery.puppetlabs.net" in the
+above example) will be printed to the left of the machine tag. The machine tag
+is a combination of the platform and role of the virtual machine.
+
+Now that you have the FQDN you can connect to the machine using SSH:
+
+```bash
+ssh -i private_key root@a9lrs93vnujsrrg.delivery.puppetlabs.net
+```
+
+*Note:* The correct SSH private key needs to be installed on your local machine
+first. Speak with a QA representative to get the correct key for "vmpooler"
+machines.
+
+## Configuration Details
+
+Now that you have successfully connected to the Puppet master you can begin
+manual testing. The script has configured Git on the Puppet master to provide
+a working "production" environment for "r10k" testing. The Git repository
+serving the Puppet environments is located at "/git_repos/environments.git".
+There is a Git clone of the remote repository located at "/root/environments".
+
+When performing manual "r10k" testing you should utilize the Git clone
+repository located at "/root/environments". The "r10k" configuration file
+"/etc/puppetlabs/r10k/r10k.yaml" is already configured to use the remote Git
+repository for deployments.

data/integration/scripts/setup_r10k_env_centos5.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/centos-5-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/scripts/setup_r10k_env_centos6.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/centos-6-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/scripts/setup_r10k_env_rhel7.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/redhat-7-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/scripts/setup_r10k_env_sles11.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/sles-11-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/scripts/setup_r10k_env_sles12.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/sles-12-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/scripts/setup_r10k_env_ubuntu1004.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/ubuntu-1004-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/scripts/setup_r10k_env_ubuntu1204.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/ubuntu-1204-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/scripts/setup_r10k_env_ubuntu1404.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir=http://neptune.puppetlabs.lan/4.0/ci-ready/
+export GIT_PROVIDER=shellgit
+
+bundle install --path .bundle/gems
+
+bundle exec beaker \
+  --preserve-hosts always \
+  --config configs/pe/ubuntu-1404-64mda \
+  --debug \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --pre-suite pre-suite \
+  --load-path lib
+
+rm -rf .bundle

data/integration/tests/basic_functionality/install_pe_only_module_with_puppetfile.rb

@@ -58,8 +58,8 @@ 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 'Download license file from artifactory'
-curl_on(master, 'https://artifactory.delivery.puppetlabs.net/artifactory/generic/r10k_test_license.key -o /etc/puppetlabs/license.key')
+step 'Download license file from int-resources'
+curl_on(master, 'http://int-resources.ops.puppetlabs.net/QA_resources/r10k/license.key -o /etc/puppetlabs/license.key')
 
 step 'Inject New "site.pp" to the "production" Environment'
 inject_site_pp(master, site_pp_path, site_pp)

data/integration/tests/basic_functionality/negative/attempt_to_install_peonly_module_without_license.rb

@@ -0,0 +1,71 @@
+require 'git_utils'
+require 'r10k_utils'
+require 'master_manipulator'
+test_name 'RK-158 - C92361 - Attempt to install a PE-only module with no license file'
+
+#Init
+env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
+r10k_fqp = get_r10k_fqp(master)
+master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
+
+git_repo_path = '/git_repos'
+git_repo_name = 'environments'
+git_control_remote = File.join(git_repo_path, "#{git_repo_name}.git")
+git_environments_path = '/root/environments'
+last_commit = git_last_commit(master, git_environments_path)
+git_provider = ENV['GIT_PROVIDER'] || 'shellgit'
+
+r10k_config_path = get_r10k_config_file_path(master)
+r10k_config_bak_path = "#{r10k_config_path}.bak"
+
+#In-line files
+r10k_conf = <<-CONF
+cachedir: '/var/cache/r10k'
+git:
+  provider: '#{git_provider}'
+sources:
+  control:
+    basedir: "#{env_path}"
+    remote: "#{git_control_remote}"
+CONF
+
+#Manifest
+site_pp_path = File.join(git_environments_path, 'manifests', 'site.pp')
+site_pp = create_site_pp(master_certname, '  include peonly')
+
+# Verification
+error_message_regex = /You must have a valid Puppet Enterprise® license on this node in order to download ztr-peonly/
+
+#Teardown
+teardown do
+  step 'Restore Original "r10k" Config'
+  on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
+
+  step 'cleanup r10k'
+  clean_up_r10k(master, last_commit, git_environments_path)
+end
+
+#Setup
+step 'Stub the forge'
+stub_forge_on(master)
+
+step 'Backup a Valid "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 'Inject New "site.pp" to the "production" Environment'
+inject_site_pp(master, site_pp_path, site_pp)
+
+step 'Copy Puppetfile to "production" Environment Git Repo'
+create_remote_file(master, "#{git_environments_path}/Puppetfile", 'mod "ztr-peonly"')
+
+step 'Push Changes'
+git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_path)
+
+#Test
+step 'Deploy "production" Environment via r10k'
+on(master, "#{r10k_fqp} deploy environment -p", :acceptable_exit_codes => [0,1]) do |result|
+  assert_match(error_message_regex, result.stderr, 'Expected error message was not observed!')
+end

data/integration/tests/basic_functionality/proxy_with_pe_only_module.rb

@@ -86,8 +86,8 @@ 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 'Download license file from artifactory'
-curl_on(master, 'https://artifactory.delivery.puppetlabs.net/artifactory/generic/r10k_test_license.key -o /etc/puppetlabs/license.key')
+step 'Download license file from int-resources'
+curl_on(master, 'http://int-resources.ops.puppetlabs.net/QA_resources/r10k/license.key -o /etc/puppetlabs/license.key')
 
 step 'Checkout "production" Branch'
 git_on(master, 'checkout production', git_environments_path)

data/integration/tests/git_source/HTTP_proxy_and_git_source.rb

@@ -28,7 +28,7 @@ git:
   provider: '#{git_provider}'
   repositories:
     - remote: 'http://example.com/fake_git_source.git'
-      proxy: 'http://ilovecatvideos.com:3128'
+      proxy: 'http://foooooooo.unresolvable:3128'
 sources:
   control:
     basedir: "#{env_path}"
@@ -64,7 +64,7 @@ git_add_commit_push(master, 'production', 'add Puppetfile', git_environments_pat
 
 #test
 on(master, "#{r10k_fqp} deploy environment -p", :accept_all_exit_codes => true) do |r|
-  regex = /proxy.*ilovecatvideos\.com/
+  regex = /proxy.*foooooooo\.unresolvable/
   assert(r.exit_code == 1, 'expected error code was not observed')
   assert_match(regex, r.stderr, 'The expected error message was not observed' )
 end