From 07607a6833fd9f550ba75bd0eabe48fe5567b804 Mon Sep 17 00:00:00 2001 From: FrozenFOXX Date: Mon, 12 Oct 2020 16:02:12 -0700 Subject: [PATCH] Added PDK commands for Puppet 6 (#122) * Added PDK commands for Puppet 6 [This](https://github.com/TheKevJames/puppet-homebrew/issues/113) issue was mentioning that the PDK command was not being used for Puppet 6 builds. I've added the PDK gem and updated the build with the new PDK command. * Commented ruby 2.2.10 tests for Puppet 6 After checking the system requirements from Puppet, the minimum required version of Ruby for Puppet 6 is 2.5.x. Package dependencies fail for Ruby 2.2.x and Puppet 6 and since it's not supported we don't need to include it in these tests. --- .circleci/config.yml | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 563dcfd6..6868a6a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,23 +96,23 @@ jobs: - run: puppet module install pkg/thekevjames-homebrew-*.tar.gz # - run: ./test.sh - build-ruby-2_2_10-puppet-6: - docker: - - image: ruby:2.2.10 - environment: - STRICT_VARIABLES: "yes" - steps: - - checkout - - run: gem install --no-ri --no-rdoc puppet-lint "puppet:<7.0.0" - - run: puppet-lint manifests/init.pp - - run: puppet-lint manifests/install.pp - - run: puppet-lint manifests/compiler.pp - - run: puppet parser validate --noop manifests/init.pp - - run: puppet parser validate --noop manifests/install.pp - - run: puppet parser validate --noop manifests/compiler.pp - - run: puppet module build - - run: puppet module install pkg/thekevjames-homebrew-*.tar.gz - # - run: ./test.sh + # build-ruby-2_2_10-puppet-6: + # docker: + # - image: ruby:2.2.10 + # environment: + # STRICT_VARIABLES: "yes" + # steps: + # - checkout + # - run: gem install --no-ri --no-rdoc pdk puppet-lint "puppet:<7.0.0" + # - run: puppet-lint manifests/init.pp + # - run: puppet-lint manifests/install.pp + # - run: puppet-lint manifests/compiler.pp + # - run: puppet parser validate --noop manifests/init.pp + # - run: puppet parser validate --noop manifests/install.pp + # - run: puppet parser validate --noop manifests/compiler.pp + # - run: pdk build + # - run: puppet module install pkg/thekevjames-homebrew-*.tar.gz + # # - run: ./test.sh # build-ruby-2_3_7-puppet-3: # docker: @@ -177,14 +177,14 @@ jobs: STRICT_VARIABLES: "yes" steps: - checkout - - run: gem install --no-ri --no-rdoc puppet-lint "puppet:<7.0.0" + - run: gem install --no-ri --no-rdoc pdk puppet-lint "puppet:<7.0.0" - run: puppet-lint manifests/init.pp - run: puppet-lint manifests/install.pp - run: puppet-lint manifests/compiler.pp - run: puppet parser validate --noop manifests/init.pp - run: puppet parser validate --noop manifests/install.pp - run: puppet parser validate --noop manifests/compiler.pp - - run: puppet module build + - run: pdk build - run: puppet module install pkg/thekevjames-homebrew-*.tar.gz # - run: ./test.sh @@ -231,14 +231,14 @@ jobs: STRICT_VARIABLES: "yes" steps: - checkout - - run: gem install --no-ri --no-rdoc puppet-lint "puppet:<7.0.0" + - run: gem install --no-ri --no-rdoc pdk puppet-lint "puppet:<7.0.0" - run: puppet-lint manifests/init.pp - run: puppet-lint manifests/install.pp - run: puppet-lint manifests/compiler.pp - run: puppet parser validate --noop manifests/init.pp - run: puppet parser validate --noop manifests/install.pp - run: puppet parser validate --noop manifests/compiler.pp - - run: puppet module build + - run: pdk build - run: puppet module install pkg/thekevjames-homebrew-*.tar.gz # - run: ./test.sh @@ -285,14 +285,14 @@ jobs: STRICT_VARIABLES: "yes" steps: - checkout - - run: gem install --no-ri --no-rdoc puppet-lint "puppet:<7.0.0" + - run: gem install --no-ri --no-rdoc pdk puppet-lint "puppet:<7.0.0" - run: puppet-lint manifests/init.pp - run: puppet-lint manifests/install.pp - run: puppet-lint manifests/compiler.pp - run: puppet parser validate --noop manifests/init.pp - run: puppet parser validate --noop manifests/install.pp - run: puppet parser validate --noop manifests/compiler.pp - - run: puppet module build + - run: pdk build - run: puppet module install pkg/thekevjames-homebrew-*.tar.gz # - run: ./test.sh @@ -312,7 +312,7 @@ workflows: # - build-ruby-2_2_10-puppet-3 - build-ruby-2_2_10-puppet-4 - build-ruby-2_2_10-puppet-5 - - build-ruby-2_2_10-puppet-6 + # - build-ruby-2_2_10-puppet-6 # - build-ruby-2_3_7-puppet-3 - build-ruby-2_3_7-puppet-4