r10k 3.15.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2085c3475000f081d4ff3ff19fd5f009080c9238c5e532449a24f306b2aa107
-  data.tar.gz: fb38a94d17d20cdd75aba6c5817cad33c77ed408307f32aa54bc4f65dabba022
+  metadata.gz: 030acd30658f5b8fdf89d1c18512defc7273e39545066e66bc9cd3cd0c16294d
+  data.tar.gz: 1548b9b6d4ce6f136eee88c5504fbcdc781fce4fee5ce847097d8f0a9b18e849
 SHA512:
-  metadata.gz: 6de1e925f24ec5edf168c5a4d177030be2d351493ab65274998bbd02b67fa84910d3a28d800bdd03d255e4fb0cceeac1b8d09a615cb181986ee22bd4e155e0fb
-  data.tar.gz: f4294cd171f9665c70d9573ad082003e5cd272aa42b2f949c41bc6874399c92010e1065140544770807444e8cf60b52d0733add89cfbd0b4839381c918932004
+  metadata.gz: be34df44f090809213bb34ca283172c41825f4ccd9b9e50568021d12df30b6c659e87e523e8e2cb1ee8ae0a5acbca806e5e26c8693b3b13adeb00a5912f446d7
+  data.tar.gz: 8ce2f367c6f2367f7bfabc89a9f60e69ac983e4a6b1b142de56be5f137d43f592a51297bd1b507b8b33f6acee399a9280f5ad8dd770753e3747a5e7ba02ed6d9

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+# raise PRs for gem updates
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10
+
+# Maintain dependencies for GitHub Actions
+- package-ecosystem: github-actions
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "13:00"
+  open-pull-requests-limit: 10

data/.github/workflows/docker.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - uses: azure/docker-login@v1
         with: # This doesn't seem to work unless we point directly to the secrets
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -27,11 +27,11 @@ jobs:
         with:
           ruby-version: 2.6.x
       - run: gem install bundler
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Build container
         working-directory: docker
         run: |

data/.github/workflows/release.yml

@@ -11,11 +11,11 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
       - name: Bump version and push tag
-        uses: anothrNick/github-tag-action@1.35.0
+        uses: anothrNick/github-tag-action@1.67.0
         env:
           GITHUB_TOKEN: ${{ secrets.PUPPET_RELEASE_GH_TOKEN }}
           DEFAULT_BUMP: patch

data/.github/workflows/rspec_tests.yml

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - 3.x
 
 jobs:
   rspec_tests:
@@ -11,20 +12,19 @@ jobs:
     strategy:
       matrix:
         cfg:
-          - {os: ubuntu-18.04, ruby: 2.4}
-          - {os: ubuntu-18.04, ruby: 2.5}
-          - {os: ubuntu-18.04, ruby: 2.6}
-          - {os: ubuntu-18.04, ruby: 2.7}
-          - {os: ubuntu-18.04, ruby: 3.1}
-          - {os: ubuntu-18.04, ruby: jruby-9.2.10.0}
-          - {os: windows-2019, ruby: 2.5}
-          - {os: windows-2019, ruby: 2.6}
-          - {os: windows-2019, ruby: 2.7}
+          - {os: ubuntu-latest, ruby: 2.6}
+          - {os: ubuntu-latest, ruby: 2.7}
+          - {os: ubuntu-latest, ruby: 3.1}
+          - {os: ubuntu-latest, ruby: 3.2}
+          - {os: ubuntu-latest, ruby: jruby-9.3}
+          - {os: ubuntu-latest, ruby: jruby-9.4}
+          - {os: windows-latest, ruby: 2.6}
+          - {os: windows-latest, ruby: 3.2}
 
     runs-on: ${{ matrix.cfg.os }}
     steps:
       - name: Checkout current PR
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Install ruby version ${{ matrix.cfg.ruby }}
         uses: ruby/setup-ruby@v1
@@ -33,7 +33,6 @@ jobs:
 
       - name: Install bundler and gems
         run: |
-          gem install bundler
           bundle config set without packaging documentation
           bundle install --jobs 4 --retry 3
 

data/.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v3
+    - uses: actions/stale@v8
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         days-before-stale: 60

data/CHANGELOG.mkd

@@ -4,6 +4,72 @@ CHANGELOG
 Unreleased
 ----------
 
+4.1.0
+-----
+
+- Allow jwt gem >= 2.8
+- r10k::module::git: expose remote as getter  [#1379](https://github.com/puppetlabs/r10k/pull/1379)
+
+4.0.2
+-----
+
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
+- Use the production forge for integration testing
+- (maint) Update beaker-pe to 3 [#1376](https://github.com/puppetlabs/r10k/pull/1376)
+- (maint) Stop puppet service during tests [#1377](https://github.com/puppetlabs/r10k/pull/1377)
+
+4.0.1
+-----
+
+- shellgit: Ensure the passed filepath to diff-index is interpreted as filepath [#1367](https://github.com/puppetlabs/r10k/pull/1367)
+
+4.0.0
+-----
+- Drop Ruby 2.3/2.4/2.5 support; use puppet_forge 4.1 or newer [#1336](https://github.com/puppetlabs/r10k/pull/1336)
+- (maint) Add Ruby 3.0 to rspec CI matrix [#1261](https://github.com/puppetlabs/r10k/pull/1261)
+- (RK-368) remove `purge_whitelist` setting [#1277](https://github.com/puppetlabs/r10k/pull/1277)
+- (RK-390) Remove default ref for deploying git modules [#1275](http://github.com/puppetlabs/r10k/pull/1275)
+- (RK-391) Change `exclude_spec` default to true for module spec dir deletion [#1264](https://github.com/puppetlabs/r10k/pull/1261)
+- (RK-383) Remove deprecated `basedir` method from Puppetfile DSL. Users should use `environment_name` instead. [#1254](https://github.com/puppetlabs/r10k/pull/1254)
+- (RK-386) Remove deprecated `bare` environment type. [#1235](https://github.com/puppetlabs/r10k/issues/1235)
+
+
+3.16.1
+------
+
+- Make metadata loading during incremental deploys more robust [PE-34917](https://perforce.atlassian.net/browse/PE-34917)
+- Use the production forge for integration testing
+
+3.16.0
+------
+
+- Emit more debug output when modules fail to sync [#1347](https://github.com/puppetlabs/r10k/pull/1347)
+- Update GitHub Actions & introduce dependabot [#1337](https://github.com/puppetlabs/r10k/pull/1337)
+- Update R10K proxy usage to follow newer rugged best practices [PE-35980](https://tickets.puppet.com/browse/PE-35980)
+- Update Acceptance tests to be compatible with Puppet 8 [#1349](https://github.com/puppetlabs/r10k/pull/1349)
+
+3.15.4
+------
+
+- Pin dependencies to maintain support for old Ruby versions [#1329](https://github.com/puppetlabs/r10k/pull/1329)
+
+3.15.3
+------
+
+- Fix dirty working copy debug logging [#1321](https://github.com/puppetlabs/r10k/pull/1321)
+- Allow gettext-setup < 2 for compatibility with Ruby 3.2 and Puppet 8 [#1325](https://github.com/puppetlabs/r10k/pull/1325)
+
+3.15.2
+------
+
+- Implement exclude regex for puppetfile install [#1248](https://github.com/puppetlabs/r10k/issues/1248)
+
+3.15.1
+------
+
+- Add TOC to configuration docs [#1298](https://github.com/puppetlabs/r10k/issues/1298)
+- Remove the spec folder from gemspec [#1316](https://github.com/puppetlabs/r10k/issues/1316)
+
 3.15.0
 ------
 

data/CODEOWNERS

@@ -1,2 +1 @@
-*        @puppetlabs/puppetserver-maintainers
-/docker/ @puppetlabs/platform-services
+* @puppetlabs/dumpling @puppetlabs/skeletor

data/Gemfile

@@ -6,10 +6,10 @@ group :extra do
 end
 
 group :development do
-  gem 'simplecov', '~> 0.9.1'
+  gem 'simplecov', '~> 0.22.0'
   gem 'ruby-prof', :platforms => :ruby
 end
 
-if File.exists? "#{__FILE__}.local"
+if File.exist? "#{__FILE__}.local"
   eval(File.read("#{__FILE__}.local"), binding)
 end

data/README.mkd

@@ -5,6 +5,12 @@ Puppet environment and module deployment
 
 [![Build Status](https://travis-ci.org/puppetlabs/r10k.png?branch=master)](https://travis-ci.org/puppetlabs/r10k)
 
+> R10k is supported and maintained by Puppet, but we consider it to be feature
+> complete and currently have no plans for any new development. We will keep it
+> working within the context of Puppet Enterprise, but we cannot make any other
+> maintenance promises at this time.
+
+
 Description
 -----------
 
@@ -14,17 +20,21 @@ 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 [environments][workflow].
 
+You might also consider [g10k](https://github.com/xorpaul/g10k) as a non-ruby
+based alternative.
+
+
 Requirements
 ------------
 
-R10k supports the Ruby versions `>= 2.4.0`. It's tested on Ruby 2.4.0 up to
+R10k supports the Ruby versions `>= 2.6.0`. It's tested on Ruby 2.6.0 up to
 Ruby 3.1.0 + Jruby.
 
 R10k requires additional components, depending on how you plan on managing
 environments and modules.
 
-  - Installing modules from the Puppet Forge requires Puppet 5.0.0+ or later.
-  Puppet 3 or 4 may work, but is generally not recommended.
+  - Installing modules from the Puppet Forge requires Puppet 7.0.0+ or later.
+  Puppet 5 and 6 may work, but is generally not recommended.
   - Git is required for creating environments and modules from Git
   - SVN is required for creating environments and modules from SVN
 
@@ -68,7 +78,7 @@ a git repository using Bundler for dependencies:
 
 ### Arch Linux
 
-Arch Linux provides a [system package](https://archlinux.org/packages/community/any/r10k/) for r10k.
+Arch Linux provides a [system package](https://archlinux.org/packages/extra/any/r10k/) for r10k.
 This is built against the [system Ruby](https://archlinux.org/packages/extra/x86_64/ruby/) (which is Ruby 3.0.2 as of 2021-08-03).
 This package is maintained by [Tim Meusel](https://github.com/bastelfreak).
 
@@ -110,24 +120,13 @@ To release a new version of the r10k gem, ensure the [changelog](CHANGELOG.mkd)
 
 By default, a patch (Z) release will be triggered. To release a new major (X) or minor (Y) version, include `#major` or `#minor` (respectively) in your commit message to trigger the appropriate release.
 
-NOTE: This currently only works for the default branch. If you would like to release from a different branch, please contact the [CODEOWNERS](CODEOWNERS).
-
 Getting help
 ------------
 
-  * IRC: r10k has a dedicated channel, `#r10k`, on Freenode where r10k questions
-  can be directed. Questions about r10k can frequently be asked in `#puppet` as well.
+  * [Puppet Community Slack](https://puppetcommunity.slack.com/)
   * Mailing lists: [puppet-users](https://groups.google.com/forum/#!forum/puppet-users)
   * Q&A: [Puppet Ask](https://ask.puppetlabs.com/questions/)
 
-Contributors
-------------
-
-Please see the CHANGELOG for a listing of the (very awesome) contributors.
-
 ## Maintenance
 
-See [CODEOWNERS](CODEOWNERS) for active repo maintainers.
-
-Open [issues](https://github.com/puppetlabs/r10k/issues) directly in the r10k repo.
-
+See [CODEOWNERS](CODEOWNERS) for current project owners.

data/doc/common-patterns.mkd

@@ -12,8 +12,7 @@ Use a [Control Repo](https://docs.puppet.com/pe/latest/cmgmt_control_repo.html)
 to store your `Puppetfile`.
 
 Hiera data should be in the Control repo OR as a separate source in
-`r10k.yaml`. Any `hiera.yaml` in the Control repo will be ignored on a per
-environment basis, locating it at `/etc/puppetlabs/puppet/hiera.yaml` is prefered.
+`r10k.yaml`.
 
 Each puppet module should be contained in its own independent forge module or
 repository.

data/doc/dynamic-environments/configuration.mkd

@@ -1,6 +1,70 @@
 Dynamic Environment Configuration
 =================================
 
+<!-- vim-markdown-toc GFM -->
+
+* [Config file location](#config-file-location)
+  * [Manual configuration](#manual-configuration)
+  * [Automatic configuration](#automatic-configuration)
+* [General options](#general-options)
+  * [cachedir](#cachedir)
+  * [proxy](#proxy)
+  * [pool_size](#pool_size)
+  * [git](#git)
+    * [provider](#provider)
+    * [proxy](#proxy-1)
+    * [username](#username)
+    * [private_key](#private_key)
+    * [oauth_token](#oauth_token)
+    * [repositories](#repositories)
+      * [private_key](#private_key-1)
+      * [oauth_token](#oauth_token-1)
+      * [proxy](#proxy-2)
+  * [forge](#forge)
+    * [proxy](#proxy-3)
+    * [baseurl](#baseurl)
+    * [authorization_token](#authorization_token)
+    * [allow_puppetfile_override](#allow_puppetfile_override)
+* [Deployment options](#deployment-options)
+  * [postrun](#postrun)
+  * [sources](#sources)
+  * [deploy](#deploy)
+    * [purge\_levels](#purge_levels)
+      * [deployment](#deployment)
+      * [environment](#environment)
+      * [puppetfile](#puppetfile)
+    * [purge\_allowlist](#purge_allowlist)
+    * [write\_lock](#write_lock)
+    * [generate\_types](#generate_types)
+    * [puppet\_path](#puppet_path)
+    * [puppet\_conf](#puppet_conf)
+    * [exclude_spec](#exclude_spec)
+* [Source options](#source-options)
+  * [remote](#remote)
+  * [basedir](#basedir)
+  * [prefix](#prefix)
+    * [prefix behaviour](#prefix-behaviour)
+  * [strip\_component](#strip_component)
+    * [strip\_component behaviour](#strip_component-behaviour)
+  * [ignore_branch_prefixes](#ignore_branch_prefixes)
+    * [ignore_branch_prefixes behaviour](#ignore_branch_prefixes-behaviour)
+  * [filter_command](#filter_command)
+* [Examples](#examples)
+  * [Minimal example](#minimal-example)
+  * [Separate hiera data](#separate-hiera-data)
+  * [Multiple tenancy](#multiple-tenancy)
+    * [Multiple tenancy with external hieradata](#multiple-tenancy-with-external-hieradata)
+* [Experimental Features](#experimental-features)
+  * [YAML Environment Source](#yaml-environment-source)
+  * [YAMLdir Environment Source](#yamldir-environment-source)
+  * [Exec environment Source](#exec-environment-source)
+  * [Environment Modules](#environment-modules)
+    * [Puppetfile module conflicts](#puppetfile-module-conflicts)
+  * [Plain Environment Type](#plain-environment-type)
+  * [Tarball Environment Type](#tarball-environment-type)
+
+<!-- vim-markdown-toc -->
+
 R10k uses a configuration file to determine how dynamic environments should be
 deployed.
 
@@ -96,6 +160,18 @@ git:
 See the [git provider documentation](../git/providers.mkd) for more information
 regarding Git providers.
 
+#### default_ref
+
+r10k is unable to deploy a git module if no `ref` is specified. A `default_ref` can be
+set in the r10k config that will become the ref a module uses if not otherwise specified. This
+is the lowest priority setting for a module's `ref`. Read the [Puppetfile documentation](../puppetfile.mkd#git)
+for higher priority settings to determine a module's ref.
+
+```yaml
+git:
+  default_ref: main
+```
+
 #### proxy
 
 The 'proxy' setting allows you to set or override the global proxy setting specifically
@@ -226,7 +302,7 @@ postrun: ['/usr/bin/curl', '-F', 'deploy=done', 'http://my-app.site/endpoint']
 The postrun setting can only be set once.
 
 Occurrences of the string `$modifiedenvs` in the postrun command will be
-replaced with the current environment(s) being deployed.
+replaced with the current environment(s) being deployed, space separated.
 
 ### sources
 
@@ -373,7 +449,7 @@ deploy:
 
 #### exclude_spec
 
-During module deployment, r10k's default behavior is to deploy the spec directory. Setting
+During module deployment, r10k's default behavior is to delete the spec directory. Setting
 `exclude_spec` to true will deploy modules without their spec directory. This behavior
 can be configured for all modules using the `exclude_spec` setting in the r10k config.
 It can also be passed as a CLI argument for `deploy environment/module`, overriding the

data/doc/puppetfile.mkd

@@ -135,6 +135,12 @@ operations when updating the repo, which can speed up install times. When
 Module versions can also be specified using `:branch` to track a specific
 branch reference.
 
+In r10k 3.x the default branch was hardcoded to `master`; in 4.x that was
+removed. A `default_ref` can be specified in the r10k config to
+to mimic that old behavior, but it is recommended to set the ref on a
+per-module basis in the Puppetfile. Read [here](dynamic-environments/configuration.mkd#default_ref) for more info
+on the `default_ref` setting.
+
 #### Examples
 
 ```ruby
@@ -327,15 +333,15 @@ on managing internal and external modules in the same directory.
 
 ### Per-Item spec dir deployment
 
-During deployment, r10k's default behavior is to deploy the spec directory. The
+During deployment, r10k's default behavior is to delete the spec directory. The
 Puppetfile can modify this per module, overriding settings from the default
-r10k config. The following example sets the module to not deploy the spec
+r10k config. The following example sets the module to deploy the spec
 directory.
 
 ```
 mod 'apache',
   :git => 'git@github.com:puppetlabs/puppetlabs-apache.git',
-  :exclude_spec => true
+  :exclude_spec => false
 ```
 
 ### Per-Item Install Path

data/integration/Gemfile

@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 4.5')
-gem 'beaker-pe', '~> 2.0'
+gem 'beaker-pe', '~> 3.0'
 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')

data/integration/Rakefile

@@ -69,7 +69,7 @@ rototiller_task :beaker_hostgenerator do |t|
     # This is a hack :(
     t.add_flag(:name => '', :default => 'centos7-64mdca-64.fa', :override_env => 'TEST_TARGET')
 
-    t.add_flag(:name => '--global-config', :default => '{forge_host=forge-aio01-petest.puppetlabs.com}', :override_env => 'BHG_GLOBAL_CONFIG')
+    t.add_flag(:name => '--global-config', :default => '{forge_host=forgeapi.puppet.com}', :override_env => 'BHG_GLOBAL_CONFIG')
   end
 end
 

data/integration/files/pre-suite/git_config.pp.erb

@@ -1,4 +1,4 @@
-$git_package = $osfamily ? {
+$git_package = $facts['os']['family'] ? {
   'Debian' => 'git-core',
   default  => 'git'
 }

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

@@ -4,3 +4,6 @@ test_name 'CODEMGMT-20 - C48 - Install Puppet Enterprise'
 
 step 'Install PE'
 install_pe
+
+step 'Stop puppet service to avoid running into existing agent runs'
+on(hosts, puppet('resource service puppet ensure=stopped'))

data/integration/pre-suite/10_git_config.rb

@@ -23,9 +23,6 @@ pe_version = get_puppet_version(master)
 fail_test('This pre-suite requires PE 3.7 or above!') if pe_version < 3.7
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Read module path'
 on(master, puppet('config print basemodulepath')) do |result|
   (result.stdout.include? ':') ? separator = ':' : separator = ';'

data/integration/tests/Puppetfile/HTTP_PROXY_affects_git_source.rb

@@ -19,7 +19,7 @@ r10k_config_bak_path = "#{r10k_config_path}.bak"
 
 puppetfile =<<-EOS
 mod 'motd',
-  :git    => 'https://github.com/puppetlabs/puppetlabs-motd'
+  :git    => 'https://github.com/puppetlabs/puppetlabs-motd', :branch => 'main'
 EOS
 
 proxy_env_value = 'http://ferritsarebest.net:3219'
@@ -36,7 +36,7 @@ sources:
 CONF
 
 teardown do
-  master.clear_env_var('HTTP_PROXY')
+  master.clear_env_var('HTTPS_PROXY')
 
   step 'Restore Original "r10k" Config'
   on(master, "mv #{r10k_config_bak_path} #{r10k_config_path}")
@@ -45,7 +45,7 @@ teardown do
   clean_up_r10k(master, last_commit, git_environments_path)
 end
 
-master.add_env_var('HTTP_PROXY', proxy_env_value)
+master.add_env_var('HTTPS_PROXY', proxy_env_value)
 
 step 'Backup Current "r10k" Config'
 on(master, "mv #{r10k_config_path} #{r10k_config_bak_path}")
@@ -64,7 +64,8 @@ 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 = /(Couldn't|Could not) resolve proxy.*ferritsarebest\.net/i
+  # Rugged as of 0.28 has a different error message than shellgit
+  regex = /((failed to resolve address for)|(Could not resolve proxy:)) ferritsarebest\.net/
   assert(r.exit_code == 1, 'expected error code was not observed')
   assert_match(regex, r.stderr, 'The expected error message was not observed' )
 end

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

@@ -6,7 +6,7 @@ test_name 'RK-110 - C88671 - Specify a bad proxy to r10k'
 confine(:to, :platform => ['el', 'sles'])
 
 #Init
-master_platform = fact_on(master, 'osfamily')
+master_platform = fact_on(master, 'os.family')
 r10k_fqp = get_r10k_fqp(master)
 
 #Verification

data/integration/tests/basic_functionality/proxy_specified_in_configuration.rb

@@ -6,7 +6,7 @@ test_name 'RK-110 - C87652 - Specify the proxy in the r10k.yaml'
 confine(:to, :platform => ['el', 'sles'])
 
 #Init
-master_platform = fact_on(master, 'osfamily')
+master_platform = fact_on(master, 'os.family')
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 r10k_fqp = get_r10k_fqp(master)
 
@@ -50,7 +50,7 @@ forge:
 CONF
 
 #Verification
-squid_log_regex = /CONNECT forgeapi.puppetlabs.com:443/
+squid_log_regex = /CONNECT forgeapi.puppet(labs)?.com:443/
 
 #Teardown
 teardown do

data/integration/tests/basic_functionality/proxy_with_puppetfile.rb

@@ -6,7 +6,7 @@ test_name 'RK-110 - C87651 - Specify a proxy in an environment variable'
 confine(:to, :platform => ['el', 'sles'])
 
 #Init
-master_platform = fact_on(master, 'osfamily')
+master_platform = fact_on(master, 'os.family')
 r10k_fqp = get_r10k_fqp(master)
 
 case master_platform
@@ -21,7 +21,7 @@ remove_squid = "#{pkg_manager} remove -y squid"
 squid_log = "/var/log/squid/access.log"
 
 #Verification
-squid_log_regex = /CONNECT forgeapi.puppetlabs.com:443/
+squid_log_regex = /CONNECT forgeapi.puppet(labs)?.com:443/
 
 #Teardown
 teardown do

data/integration/tests/basic_functionality/rugged_git_provider_with_ssh.rb

@@ -10,12 +10,12 @@ confine(:to, :platform => ['el', 'ubuntu', 'sles'])
 
 if ENV['GIT_PROVIDER'] == 'shellgit'
   skip_test('Skipping test because removing Git from the system affects other "shellgit" tests.')
-elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+elsif fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 
 #Init
-master_platform = fact_on(master, 'osfamily')
+master_platform = fact_on(master, 'os.family')
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 r10k_fqp = get_r10k_fqp(master)
@@ -87,7 +87,7 @@ step 'Remove "git" Package from System'
 if master_platform == 'RedHat'
   on(master, 'yum remove -y git')
 elsif master_platform == 'Debian'
-  if fact_on(master, "operatingsystemmajrelease") == '10.04'
+  if fact_on(master, "os.release.major") == '10.04'
     on(master, 'apt-get remove -y git-core')
   else
     on(master, 'apt-get remove -y git')

data/integration/tests/basic_functionality/rugged_git_provider_without_ssh.rb

@@ -8,12 +8,12 @@ confine(:to, :platform => ['el', 'ubuntu', 'sles'])
 
 if ENV['GIT_PROVIDER'] == 'shellgit'
   skip_test('Skipping test because removing Git from the system affects other "shellgit" tests.')
-elsif fact_on(master, 'osfamily') == 'RedHat' and fact_on(master, "operatingsystemmajrelease").to_i < 6
+elsif fact_on(master, 'os.family') == 'RedHat' and fact_on(master, "os.release.major").to_i < 6
   skip_test('This version of EL is not supported by this test case!')
 end
 
 #Init
-master_platform = fact_on(master, 'osfamily')
+master_platform = fact_on(master, 'os.family')
 master_certname = on(master, puppet('config', 'print', 'certname')).stdout.rstrip
 env_path = on(master, puppet('config print environmentpath')).stdout.rstrip
 r10k_fqp = get_r10k_fqp(master)
@@ -86,7 +86,7 @@ step 'Remove "git" Package from System'
 if master_platform == 'RedHat'
   on(master, 'yum remove -y git')
 elsif master_platform == 'Debian'
-  if fact_on(master, "operatingsystemmajrelease") == '10.04'
+  if fact_on(master, "os.release.major") == '10.04'
     on(master, 'apt-get remove -y git-core')
   else
     on(master, 'apt-get remove -y git')

data/integration/tests/command_line/deploy_env_without_mod_update.rb

@@ -46,9 +46,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Inject New "site.pp" to the "production" Environment'
 inject_site_pp(master, site_pp_path, site_pp)
 

data/integration/tests/command_line/negative/neg_deploy_env_with_module_update.rb

@@ -47,9 +47,6 @@ teardown do
 end
 
 #Setup
-step 'Stub Forge on Master'
-stub_forge_on(master)
-
 step 'Inject New "site.pp" to the "production" Environment'
 inject_site_pp(master, site_pp_path, site_pp)