diff options
author | Gabriel Nagy <gabriel.nagy@puppet.com> | 2021-02-18 15:53:50 +0200 |
---|---|---|
committer | Gabriel Nagy <gabriel.nagy@puppet.com> | 2021-02-18 15:53:50 +0200 |
commit | 21b64774613765d13275afca0fdc61c6e80b1245 (patch) | |
tree | a5664f4bf5d5ecb14d86093e372a2d4b8d8c1969 | |
parent | 6202369c2b8668115386c9d7c77ec8eaf82fa017 (diff) | |
download | puppet-hosts_core-21b64774613765d13275afca0fdc61c6e80b1245.tar.gz puppet-hosts_core-21b64774613765d13275afca0fdc61c6e80b1245.tar.bz2 |
(MODULES-10945) Do not install PDK when running PR tests
Create a separate group in the Gemfile for pdk and puppet-blacksmith
which are only used for releasing. In the workflow, avoid installing the
release group.
-rw-r--r-- | .github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml | 1 | ||||
-rw-r--r-- | .github/workflows/static_code_analysis.yaml | 1 | ||||
-rw-r--r-- | .github/workflows/unit_tests_with_nightly_puppet_gem.yaml | 1 | ||||
-rw-r--r-- | .github/workflows/unit_tests_with_released_puppet_gem.yaml | 1 | ||||
-rw-r--r-- | Gemfile | 5 |
5 files changed, 8 insertions, 1 deletions
diff --git a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml index 5bd0f50..34c169d 100644 --- a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml @@ -52,6 +52,7 @@ jobs: run: | git config --global core.longpaths true bundle config set system 'true' + bundle config set --local without 'release' ${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]') bundle update --jobs 4 --retry 3 diff --git a/.github/workflows/static_code_analysis.yaml b/.github/workflows/static_code_analysis.yaml index 0a1f427..89c2cd4 100644 --- a/.github/workflows/static_code_analysis.yaml +++ b/.github/workflows/static_code_analysis.yaml @@ -30,6 +30,7 @@ jobs: - name: Prepare testing environment with bundler run: | git config --global core.longpaths true + bundle config set --local without 'release' bundle update --jobs 4 --retry 3 - name: Run commits check diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml index 0b1afc0..8fad5ef 100644 --- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml @@ -54,6 +54,7 @@ jobs: run: | git config --global core.longpaths true bundle config set system 'true' + bundle config set --local without 'release' ${{ matrix.env_set_cmd }}PUPPET_GEM_VERSION=$(ruby -e 'puts /puppet\s+\((.+)\)/.match(`gem list -eld puppet`)[1]') bundle update --jobs 4 --retry 3 diff --git a/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml index 11ddefe..61b7b4c 100644 --- a/.github/workflows/unit_tests_with_released_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml @@ -43,6 +43,7 @@ jobs: run: | git config --global core.longpaths true bundle config set system 'true' + bundle config set --local without 'release' bundle update --jobs 4 --retry 3 - name: Run unit tests @@ -46,8 +46,11 @@ group :system_tests do gem "beaker-hostgenerator" gem "beaker-rspec" gem "beaker-puppet", *location_for(ENV['BEAKER_PUPPET_VERSION'] || '~> 1.0') - gem "pdk", '~> 1.18', platforms: [:ruby] +end + +group :release do gem "puppet-blacksmith", '~> 3.4', require: false + gem "pdk", platforms: [:ruby] end puppet_version = ENV['PUPPET_GEM_VERSION'] |