From 7144dc76b40862c708a627739d2e2da8a2d270c4 Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Fri, 1 Nov 2019 12:38:14 +0800 Subject: [PATCH 1/2] (maint) Update for PDK templates This commit updates the module as per PDK-Templates commit 0b5b39b --- .rubocop.yml | 7 +++++++ Gemfile | 2 +- Rakefile | 13 +++++++++++-- metadata.json | 4 ++-- spec/default_facts.yml | 1 + 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index ee74e8cb..33688a79 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -27,6 +27,7 @@ GetText/DecorateString: Description: We don't want to decorate test output. Exclude: - spec/**/* + Enabled: false RSpec/BeforeAfterAll: Description: Beware of using after(:all) as it may cause state to leak between tests. A necessary evil in acceptance testing. @@ -89,6 +90,12 @@ Style/MethodCalledOnDoEndBlock: Enabled: true Style/StringMethods: Enabled: true +GetText/DecorateFunctionMessage: + Enabled: false +GetText/DecorateStringFormattingUsingInterpolation: + Enabled: false +GetText/DecorateStringFormattingUsingPercent: + Enabled: false Layout/EndOfLine: Enabled: false Layout/IndentHeredoc: diff --git a/Gemfile b/Gemfile index e3cea7e9..43b4dbce 100644 --- a/Gemfile +++ b/Gemfile @@ -72,4 +72,4 @@ extra_gemfiles.each do |gemfile| eval(File.read(gemfile), binding) end end -# vim: syntax=ruby \ No newline at end of file +# vim: syntax=ruby diff --git a/Rakefile b/Rakefile index 13b58c86..c45dfc8c 100644 --- a/Rakefile +++ b/Rakefile @@ -16,8 +16,17 @@ end def changelog_project return unless Rake.application.top_level_tasks.include? "changelog" - returnVal = nil || JSON.load(File.read('metadata.json'))['source'].match(%r{.*/([^/]*)})[1] - raise "unable to find the changelog_project in .sync.yml or the name in metadata.json" if returnVal.nil? + + returnVal = nil + returnVal ||= begin + metadata_source = JSON.load(File.read('metadata.json'))['source'] + metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z}) + + metadata_source_match && metadata_source_match[1] + end + + raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil? + puts "GitHubChangelogGenerator project:#{returnVal}" returnVal end diff --git a/metadata.json b/metadata.json index 2b19b57d..2ecce7d1 100644 --- a/metadata.json +++ b/metadata.json @@ -84,6 +84,6 @@ } ], "template-url": "https://github.com/puppetlabs/pdk-templates/#master", - "template-ref": "1.12.0-0-g55d9ae2", - "pdk-version": "1.12.0" + "template-ref": "1.14.1-0-g0b5b39b", + "pdk-version": "1.14.0" } diff --git a/spec/default_facts.yml b/spec/default_facts.yml index ea1e4808..f777abfc 100644 --- a/spec/default_facts.yml +++ b/spec/default_facts.yml @@ -3,5 +3,6 @@ # Facts specified here will override the values provided by rspec-puppet-facts. --- ipaddress: "172.16.254.254" +ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA" is_pe: false macaddress: "AA:AA:AA:AA:AA:AA" From 32db7f09541d8d2fed284260b03a8f11c978f423 Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Fri, 1 Nov 2019 12:40:37 +0800 Subject: [PATCH 2/2] (PDK-1501) Allow Travis CI config to be templated Previously the module unmanaged the Travis CI file when converted to Litmus. This commit allows the Travis CI file to be managed. --- .sync.yml | 87 +++++++++++++++++++++++++++++++++++++++++++++++-- .travis.yml | 93 +++++++++++++++++++++++------------------------------ 2 files changed, 125 insertions(+), 55 deletions(-) diff --git a/.sync.yml b/.sync.yml index 751a898b..49f01dc5 100644 --- a/.sync.yml +++ b/.sync.yml @@ -14,7 +14,90 @@ - rubocop-rspec .travis.yml: - unmanaged: true + dist: trusty + user: puppet + secure: "" + branches: + - release + includes: + - + bundler_args: + dist: trusty + env: PLATFORMS=debian_puppet5 + rvm: 2.5.3 + before_script: + - bundle exec rake 'litmus:provision_list[waffle_deb]' + - bundle exec rake 'litmus:install_agent[puppet5]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + - + bundler_args: + dist: trusty + env: PLATFORMS=debian_puppet6 + rvm: 2.5.3 + before_script: + - bundle exec rake 'litmus:provision_list[waffle_deb]' + - bundle exec rake 'litmus:install_agent[puppet6]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + - + bundler_args: + dist: trusty + env: PLATFORMS=el6_puppet5 + rvm: 2.5.3 + before_script: + - bundle exec rake 'litmus:provision_list[waffle_el6]' + - bundle exec rake 'litmus:install_agent[puppet5]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + - + bundler_args: + dist: trusty + env: PLATFORMS=el6_puppet6 + rvm: 2.5.3 + before_script: + - bundle exec rake 'litmus:provision_list[waffle_el6]' + - bundle exec rake 'litmus:install_agent[puppet6]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + - + bundler_args: + dist: trusty + env: PLATFORMS=el7_puppet5 + rvm: 2.5.3 + before_script: + - bundle exec rake 'litmus:provision_list[waffle_el7]' + - bundle exec rake 'litmus:install_agent[puppet5]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + - + bundler_args: + dist: trusty + env: PLATFORMS=el7_puppet6 + rvm: 2.5.3 + before_script: + - bundle exec rake 'litmus:provision_list[waffle_el7]' + - bundle exec rake 'litmus:install_agent[puppet6]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required appveyor.yml: delete: true @@ -29,7 +112,7 @@ Gemfile: required: ':development': - gem: puppet-lint-i18n - + Rakefile: requires: diff --git a/.travis.yml b/.travis.yml index dc915571..8dc8b62c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,97 +13,84 @@ script: bundler_args: --without system_tests rvm: - 2.5.3 -env: - global: - - PUPPET_GEM_VERSION="~> 6.0" +stages: + - static + - spec + - acceptance + - + if: tag =~ ^v\d + name: deploy matrix: fast_finish: true include: - - bundler_args: + env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" + stage: static + - + env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec + rvm: 2.4.5 + stage: spec + - + env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec + rvm: 2.5.3 + stage: spec + - + env: DEPLOY_TO_FORGE=yes + stage: deploy + - + before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] + bundler_args: dist: trusty env: PLATFORMS=debian_puppet5 rvm: 2.5.3 - before_script: - - bundle exec rake 'litmus:provision_list[waffle_deb]' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel + script: ["bundle exec rake litmus:acceptance:parallel"] services: docker sudo: required - - bundler_args: + before_script: ["bundle exec rake 'litmus:provision_list[waffle_deb]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] + bundler_args: dist: trusty env: PLATFORMS=debian_puppet6 rvm: 2.5.3 - before_script: - - bundle exec rake 'litmus:provision_list[waffle_deb]' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel + script: ["bundle exec rake litmus:acceptance:parallel"] services: docker sudo: required - - bundler_args: + before_script: ["bundle exec rake 'litmus:provision_list[waffle_el6]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] + bundler_args: dist: trusty env: PLATFORMS=el6_puppet5 rvm: 2.5.3 - before_script: - - bundle exec rake 'litmus:provision_list[waffle_el6]' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel + script: ["bundle exec rake litmus:acceptance:parallel"] services: docker sudo: required - - bundler_args: + before_script: ["bundle exec rake 'litmus:provision_list[waffle_el6]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] + bundler_args: dist: trusty env: PLATFORMS=el6_puppet6 rvm: 2.5.3 - before_script: - - bundle exec rake 'litmus:provision_list[waffle_el6]' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel + script: ["bundle exec rake litmus:acceptance:parallel"] services: docker sudo: required - - bundler_args: + before_script: ["bundle exec rake 'litmus:provision_list[waffle_el7]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] + bundler_args: dist: trusty env: PLATFORMS=el7_puppet5 rvm: 2.5.3 - before_script: - - bundle exec rake 'litmus:provision_list[waffle_el7]' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel + script: ["bundle exec rake litmus:acceptance:parallel"] services: docker sudo: required - - bundler_args: + before_script: ["bundle exec rake 'litmus:provision_list[waffle_el7]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] + bundler_args: dist: trusty env: PLATFORMS=el7_puppet6 rvm: 2.5.3 - before_script: - - bundle exec rake 'litmus:provision_list[waffle_el7]' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel + script: ["bundle exec rake litmus:acceptance:parallel"] services: docker sudo: required - - - env: CHECK="syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop" - - - env: CHECK=parallel_spec - - - env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec - rvm: 2.4.5 branches: only: - master @@ -119,4 +106,4 @@ deploy: on: tags: true all_branches: true - condition: "$DEPLOY_TO_FORGE = yes" \ No newline at end of file + condition: "$DEPLOY_TO_FORGE = yes"