r10k 3.4.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa591e05f2bcb8e3e7acb9b4ac018ef5a3471832bca677a49c5a409f358b5a8
-  data.tar.gz: 9d27ceb63bc53563b419140a3de96b744171bb790d8fb12a2a4c73e4b3feb2cf
+  metadata.gz: 564ea5e6a1060b6ceb4a5986857b612de2b47179b57998dbdb2415be1e9e795a
+  data.tar.gz: 4f14b580320afc67069326a81d89e7335cdc6ffe1ec58f45edc497150fdb16e3
 SHA512:
-  metadata.gz: 1cc2808331cbcb0f52ce418eaea05995a96ddec0bc5e523b7179969d4f51609745912ae7a8e621104a704a40f71a7502bdc809d10948ea39961cb288a81ddd9c
-  data.tar.gz: 418fcc583a83105d5953cd1df74e4ea09735b427765c67f2600d357c3daade952a7d1242f102d1bf2c34b71aa8bcd7cfeca7416274d97911b2916a28b7b03571
+  metadata.gz: 93c8178a7c9dfa287c78d43e89685b68f27e330748d8865c9b9cb6f30b47a9012e33fed10c5b84d0ce37e14c133fc724506dcb57684a4c3f3e48fc2da884ddf2
+  data.tar.gz: b434ab7451f5f064a37de886673e9be6ebfc24628f496f262197a5f2a9c9cdb631922138aa67dd1f6173b1ce515c48bc028fd286939d4134dc0e8f610f4b7676

data/.github/pull_request_template.md

@@ -0,0 +1 @@
+Please add all notable changes to the "Unreleased" section of the CHANGELOG.

data/.github/workflows/release.yml

@@ -0,0 +1,36 @@
+name: Tag and release
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'lib/r10k/version.rb'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - name: Bump version and push tag
+        uses: anothrNick/github-tag-action@1.17.2
+        env:
+          GITHUB_TOKEN: ${{ secrets.PUPPET_RELEASE_GH_TOKEN }}
+          DEFAULT_BUMP: patch
+          WITH_V: false
+          # Uncomment this if the tag and version file become out-of-sync and
+          # you need to tag at a specific version.
+          # CUSTOM_TAG:
+      - name: Build gem
+        uses: scarhand/actions-ruby@master
+        with:
+          args: build *.gemspec
+      - name: Publish gem
+        uses: scarhand/actions-ruby@master
+        env:
+          RUBYGEMS_AUTH_TOKEN: ${{ secrets.RUBYGEMS_AUTH_TOKEN }}
+        with:
+          args: push *.gem
+

data/.travis.yml

@@ -12,6 +12,8 @@ jdk:
 before_install: gem install bundler -v '< 2' --no-document
 matrix:
   include:
+    - stage: r10k tests
+      rvm: 2.7.0
     - stage: r10k tests
       rvm: 2.6.5
     - stage: r10k tests

data/CHANGELOG.mkd

@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+Unreleased
+----
+
+3.4.1
+----
+- Add support for Ruby 2.7
+- (RK-357) Restrict gettext and fast_gettext versions for compatibility with Ruby 2.4
+- Bump cri to 2.15.10
+- (RK-360) Allow overriding the cachedir in `deploy module`
+- Bump puppet_forge to 2.3.0
+
 3.4.0
 -----
 
@@ -144,6 +155,22 @@ Ruby >= 2.3 official and documented.
     - Unable to parse Puppetfile
   - Various perfomance improvements
 
+2.6.8
+----
+
+### Changes
+
+(RK-357) Restrict gettext and fast_gettext versions for compatibility with Ruby 2.4.
+(RK-358) Update puppet_forge to ~> 2.3.0.
+
+2.6.7
+----
+
+### Changes
+
+(CDPE-1813) Add module deploy info to .r10k-deploy.json.
+(RK-351) Update minitar to ~> 0.9.0.
+
 2.6.6
 ----
 

data/CODEOWNERS

@@ -1,2 +1,2 @@
-*        @puppetlabs/puppetserver-maintainers
+*        @puppetlabs/puppetserver-maintainers @adrienthebo @dhollinger
 /docker/ @puppetlabs/pupperware

data/README.mkd

@@ -8,11 +8,11 @@ Puppet environment and module deployment
 Description
 -----------
 
-[workflow]: http://puppetlabs.com/blog/git-workflow-and-puppet-environments/
+[workflow]: https://puppet.com/docs/puppet/latest/environments_about.html
 
 R10k provides a general purpose toolset for deploying Puppet environments and
 modules. It implements the [Puppetfile](doc/puppetfile.mkd) format and provides a native
-implementation of Puppet [dynamic environments][workflow].
+implementation of Puppet [environments][workflow].
 
 Requirements
 ------------

data/doc/dynamic-environments/configuration.mkd

@@ -48,7 +48,7 @@ cachedir: '/var/cache/r10k'
 
 
 The cachedir setting defaults to `~/.r10k`. If the HOME environment variable is
-unset r10k will assume that r10k is being run with the Puppet [`prerun_command`](http://docs.puppetlabs.com/references/latest/configuration.html#preruncommand)
+unset r10k will assume that r10k is being run with the Puppet [`prerun_command`](https://puppet.com/docs/puppet/latest/configuration.html#preruncommand)
 setting and will set the cachedir default to `/root/.r10k`.
 
 ### proxy

data/doc/dynamic-environments/git-environments.mkd

@@ -29,7 +29,7 @@ seamlessly reflected in Puppet environments. This means that creating a new Git
 branch creates a new Puppet environment, updating a Git branch will update that
 environment, and deleting a Git branch will remove that environment.
 
-R10k supports both [directory and config file environments](https://docs.puppetlabs.com/puppet/latest/reference/environments.html).
+R10k supports both [directory and config file environments](https://puppet.com/docs/puppet/latest/env_environments.html).
 Ensure that the basedir for your sources and your puppet config align.
 
 How it works

data/doc/dynamic-environments/master-configuration.mkd

@@ -1,70 +1,40 @@
 Puppet master configuration
 ===========================
 
-In order to use dynamic environments, your Puppet masters will need to be
+In order to use environments, your Puppet masters will need to be
 configured to load manifests and modules relative to the requested environment.
-The following settings should be configured in puppet.conf.
 
-## Puppet <= 3.4.x
+This is the default behavior in Puppet 4+
 
-In Puppet 3.4 and earlier, dynamic environments are achieved by interpolating
-the `$environment` variable in the modulepath, manifestdir, and manifest
-settings. When environments is loaded the settings are dynamically set based on
-the name of the environment, thus allowing environments to be created on the
-fly.
+This behavior is controled by the following settings
+(listed with their default values):
 
-    [master]
-        modulepath = /etc/puppet/environments/$environment/modules:/etc/puppet/environments/$environment/dist
+```
+codedir = /etc/puppetlabs/code
+environmentpath = $codedir/environments
+basemodulepath = $codedir/modules:/opt/puppetlabs/puppet/share/modules
+```
 
-        # If you use a top level manifest dir
-        manifestdir = /etc/puppet/environments/$environment/manifests
-        # If you use a specific site wide manifest
-        manifest = /etc/puppet/environments/$environment/manifests/nodes.pp
+The environment requested by the agent or assigned to it by an ENC is looked
+for at `$environmentpath/$environment`.
 
-## Puppet = 3.5.x
+That environment may have an environment.conf file in its base directory that
+specifies its own modulepath. If not, the default computed modulepath for that
+environment is `$environmentpath/$environment/modules:$basemodulepath`.
 
-Puppet 3.5.0 adds initial support for "directory environments", where
-environments are created by enumerating directories in `$environmentpath`.
-This new configuration expect that all modules are in the root of the
-directories in the environment path.
+These configuration variables are documented at
+[Puppet Configuration Reference](https://puppet.com/docs/puppet/latest/configuration.html)
+and their interaction in forming the modulepath is documented at
+[Directories and the Modulepath](https://puppet.com/docs/puppet/latest/dirs_modulepath.html).
+More information can be found about environments in general at
+[Creating Environmnets](https://puppet.com/docs/puppet/latest/environments_creating.html).
 
-    [master]
-    # None of modulepath, manifestdir, or manifest should be enabled
-    # See http://docs.puppetlabs.com/puppet/latest/reference/environments.html#enabling-directory-environments
-    #   for more information on the changes
-        environmentpath = $confdir/environments
+The evolution to using environments in this way was a gradual one from community
+conventions to supported feature and there were several intermediate stages that
+had different configuration requirements within the puppet.conf. Some Puppet
+documentation from the 3.x and 4.x series may no longer be applicable to the
+above which solidified in Puppet 4.x.
 
-Note that these settings go into the `[master]` section; you don't need to
-explicitly configure an environment section for each environment you want to
-use. (But you can if you want.)
-
-## Puppet >= 3.6.0
-
-[environmentconf]: http://docs.puppetlabs.com/puppet/latest/reference/config_file_environment.html
-
-Puppet 3.6.0 adds more fine grained control over how directory environments are
-configured. Each directory based environment can have an
-[`environment.conf`][environmentconf] file in the root of that environment that
-can specify the manifest, modulepath, config_version, and environment_timeout
-for that specific environment.
-
-    # puppet.conf
-    [master]
-    # None of modulepath, manifestdir, or manifest should be enabled
-    # See http://docs.puppetlabs.com/puppet/latest/reference/environments.html#enabling-directory-environments
-    #   for more information on the changes
-        environmentpath = $confdir/environments
-
-- - -
-
-    # environment.conf
-    manifest  = site.pp
-    moduledir = modules:dist
-
-A deployed environment with a Puppetfile will look something like this:
-
-    .
-    ├── Puppetfile
-    ├── environment.conf
-    ├── dist
-    └── modules
+If you need to upgrade away from any intermediate setup see
+[Environments in Puppet 3.8](https://puppet.com/docs/puppet/3.8/environments.html)
+for examples that may help.

data/integration/Rakefile

@@ -44,8 +44,8 @@ EOS
 
   t.add_env do |env|
     env.name = 'pe_dist_dir'
-    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"
+    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"
   end
 
   t.add_env do |env|

data/lib/r10k/action/deploy/module.rb

@@ -72,7 +72,11 @@ module R10K
         end
 
         def allowed_initialize_opts
-          super.merge(environment: true, 'no-force': :self, 'generate-types': :self, 'puppet-path': :self)
+          super.merge(environment: true,
+                      cachedir: :self,
+                      'no-force': :self,
+                      'generate-types': :self,
+                      'puppet-path': :self)
         end
       end
     end

data/lib/r10k/cli/deploy.rb

@@ -18,7 +18,7 @@ module R10K::CLI
 
         description <<-DESCRIPTION
 `r10k deploy` implements the Git branch to Puppet environment workflow
-(https://puppetlabs.com/blog/git-workflow-and-puppet-environments/).
+(https://puppet.com/docs/puppet/latest/environments_about.html).
         DESCRIPTION
 
         required nil, :cachedir, 'Specify a cachedir, overriding the value in config'

data/lib/r10k/version.rb

@@ -1,3 +1,6 @@
 module R10K
-  VERSION = '3.4.0'
+  # When updating to a new major (X) or minor (Y) version, include `#major` or
+  # `#minor` (respectively) in your commit message to trigger the appropriate
+  # release. Otherwise, a new patch (Z) version will be released.
+  VERSION = '3.4.1'
 end

data/r10k.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.license  = 'Apache-2.0'
 
   s.add_dependency 'colored2',   '3.1.2'
-  s.add_dependency 'cri',       '2.15.6'
+  s.add_dependency 'cri', ['>= 2.15.10', '< 3.0.0']
 
   s.add_dependency 'log4r',     '1.1.10'
   s.add_dependency 'multi_json', '~> 1.10'
@@ -31,6 +31,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'puppet_forge', '~> 2.3.0'
 
   s.add_dependency 'gettext-setup', '~>0.24'
+  # These two pins narrow what is allowed by gettext-setup,
+  # to preserver compatability with Ruby 2.4
+  s.add_dependency 'fast_gettext', '~> 1.1.0'
+  s.add_dependency 'gettext', ['>= 3.0.2', '< 3.3.0']
 
   s.add_development_dependency 'rspec', '~> 3.1'
 

data/spec/unit/action/deploy/module_spec.rb

@@ -25,6 +25,10 @@ describe R10K::Action::Deploy::Module do
     it 'can accept a puppet-path option' do
       described_class.new({ 'puppet-path': '/nonexistent' }, [])
     end
+
+    it 'can accept a cachedir option' do
+      described_class.new({ cachedir: '/nonexistent' }, [])
+    end
   end
 
   describe "with no-force" do
@@ -123,4 +127,13 @@ describe R10K::Action::Deploy::Module do
       expect(subject.instance_variable_get(:@puppet_path)).to eq('/nonexistent')
     end
   end
+
+  describe 'with cachedir' do
+
+    subject { described_class.new({ config: '/some/nonexistent/path', cachedir: '/nonexistent' }, []) }
+
+    it 'sets puppet_path' do
+      expect(subject.instance_variable_get(:@cachedir)).to eq('/nonexistent')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored2
@@ -28,16 +28,22 @@ dependencies:
   name: cri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.15.6
+        version: 2.15.10
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.15.10
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.15.6
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +100,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.24'
+- !ruby/object:Gem::Dependency
+  name: fast_gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: gettext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +201,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitattributes"
+- ".github/pull_request_template.md"
 - ".github/workflows/docker.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.mkd
@@ -222,15 +264,6 @@ files:
 - integration/pre-suite/10_git_config.rb
 - integration/pre-suite/20_pe_r10k.rb
 - integration/pre-suite/README.mkd
-- integration/scripts/README.mkd
-- integration/scripts/setup_r10k_env_centos5.sh
-- integration/scripts/setup_r10k_env_centos6.sh
-- integration/scripts/setup_r10k_env_rhel7.sh
-- integration/scripts/setup_r10k_env_sles11.sh
-- integration/scripts/setup_r10k_env_sles12.sh
-- 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_affects_forge_source.rb
 - integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb
 - integration/tests/README.mkd
@@ -538,7 +571,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Puppet environment and module deployment

data/integration/scripts/README.mkd

@@ -1,86 +0,0 @@
-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

@@ -1,23 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/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

@@ -1,23 +0,0 @@
-#!/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