From fb850647a89e0c23b39c69a9209998884b09500a Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Thu, 21 Nov 2019 17:17:50 +0000 Subject: [PATCH 1/6] (maint) sort and canonicalise .sync.yml --- .sync.yml | 135 +++++++++++++++++++++++++----------------------------- 1 file changed, 63 insertions(+), 72 deletions(-) diff --git a/.sync.yml b/.sync.yml index f125e58..4786d68 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,83 +1,74 @@ --- -.gitignore: +".gitignore": required: - - ---.project - -.gitlab-ci.yml: + - "---.project" +".gitlab-ci.yml": unmanaged: true - -.travis.yml: +".travis.yml": branches: - - release + - release includes: - - - bundler_args: - dist: trusty - env: PLATFORMS=deb_puppet5 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_deb]' - - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - - - bundler_args: - dist: trusty - env: PLATFORMS=deb_puppet6 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_deb]' - - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - - - bundler_args: - dist: trusty - env: PLATFORMS=el_puppet5 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_el]' - - bundle exec rake 'litmus:install_agent[puppet5]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - - - bundler_args: - dist: trusty - env: PLATFORMS=el_puppet6 - rvm: 2.5.1 - before_script: - - bundle exec rake 'litmus:provision_list[travis_el]' - - bundle exec rake 'litmus:install_agent[puppet6]' - - bundle exec rake litmus:install_module - script: - - bundle exec rake litmus:acceptance:parallel - services: docker - sudo: required - stage: acceptance - + - bundler_args: + dist: trusty + env: PLATFORMS=deb_puppet5 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_deb]' + - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' + - bundle exec rake 'litmus:install_agent[puppet5]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + stage: acceptance + - bundler_args: + dist: trusty + env: PLATFORMS=deb_puppet6 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_deb]' + - bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*' + - bundle exec rake 'litmus:install_agent[puppet6]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + - bundler_args: + dist: trusty + env: PLATFORMS=el_puppet5 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_el]' + - bundle exec rake 'litmus:install_agent[puppet5]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + stage: acceptance + - bundler_args: + dist: trusty + env: PLATFORMS=el_puppet6 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_el]' + - bundle exec rake 'litmus:install_agent[puppet6]' + - bundle exec rake litmus:install_module + script: + - bundle exec rake litmus:acceptance:parallel + services: docker + sudo: required + stage: acceptance appveyor.yml: delete: true - Gemfile: optional: - ':development': - - gem: 'github_changelog_generator' - git: 'https://github.com/skywinder/github-changelog-generator' - ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' - condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')" - + ":development": + - gem: github_changelog_generator + git: https://github.com/skywinder/github-changelog-generator + ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018 + condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') spec/spec_helper.rb: - mock_with: ':rspec' + mock_with: ":rspec" coverage_report: true From 4610ca34a801d7d594b190a860f3656481c681fe Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Thu, 21 Nov 2019 17:18:40 +0000 Subject: [PATCH 2/6] (maint) mark .gitlab-ci.yml as deleted --- .sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sync.yml b/.sync.yml index 4786d68..2b5530b 100644 --- a/.sync.yml +++ b/.sync.yml @@ -3,7 +3,7 @@ required: - "---.project" ".gitlab-ci.yml": - unmanaged: true + delete: true ".travis.yml": branches: - release From d30c38266beb79ae2afbbe6228c2bbcdd0d0d6a6 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Thu, 21 Nov 2019 18:06:18 +0000 Subject: [PATCH 3/6] (maint) remove obsolete gepetto .project files --- .project | 23 ----------------------- .sync.yml | 3 --- 2 files changed, 26 deletions(-) delete mode 100644 .project diff --git a/.project b/.project deleted file mode 100644 index 139ecf7..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - puppetlabs-java - - - - - - com.puppetlabs.geppetto.pp.dsl.ui.modulefileBuilder - - - - - org.eclipse.xtext.ui.shared.xtextBuilder - - - - - - com.puppetlabs.geppetto.pp.dsl.ui.puppetNature - org.eclipse.xtext.ui.shared.xtextNature - - diff --git a/.sync.yml b/.sync.yml index 2b5530b..5be9772 100644 --- a/.sync.yml +++ b/.sync.yml @@ -1,7 +1,4 @@ --- -".gitignore": - required: - - "---.project" ".gitlab-ci.yml": delete: true ".travis.yml": From e300649623841f25786d71d2f3621bb40622bb3f Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Thu, 21 Nov 2019 18:16:13 +0000 Subject: [PATCH 4/6] (maint) update gitignore and pdkignore for .project file removal --- .gitignore | 1 + .pdkignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3f4e2e8..2767022 100644 --- a/.gitignore +++ b/.gitignore @@ -22,5 +22,6 @@ /convert_report.txt /update_report.txt .DS_Store +.project .envrc /inventory.yaml diff --git a/.pdkignore b/.pdkignore index 54d2cda..e6215cd 100644 --- a/.pdkignore +++ b/.pdkignore @@ -22,6 +22,7 @@ /convert_report.txt /update_report.txt .DS_Store +.project .envrc /inventory.yaml /appveyor.yml From a57d124d7d6f42d58263308e410d0365fc770848 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Mon, 25 Nov 2019 18:25:27 +0000 Subject: [PATCH 5/6] (maint) enable simplecov for ruby codecoverage testing --- .sync.yml | 1 + .travis.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.sync.yml b/.sync.yml index 5be9772..cfcea95 100644 --- a/.sync.yml +++ b/.sync.yml @@ -57,6 +57,7 @@ services: docker sudo: required stage: acceptance + simplecov: true appveyor.yml: delete: true Gemfile: diff --git a/.travis.yml b/.travis.yml index 8c16952..7e923a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_install: - gem --version - bundle -v script: - - 'bundle exec rake $CHECK' + - 'SIMPLECOV=yes bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - 2.5.3 @@ -34,9 +34,6 @@ matrix: 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[travis_deb]'", "bundle exec bolt command run 'apt-get install wget -y' --inventoryfile inventory.yaml --nodes='localhost*'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] bundler_args: @@ -75,6 +72,9 @@ matrix: services: docker stage: acceptance sudo: required + - + env: DEPLOY_TO_FORGE=yes + stage: deploy branches: only: - master From 26e9bcfc1aec0000510da898e97ee32c3ca57e64 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Wed, 27 Nov 2019 18:31:35 +0000 Subject: [PATCH 6/6] (maint) Update to PDK 1.14.1 --- Gemfile | 1 - README.markdown => README.md | 0 metadata.json | 6 +++--- 3 files changed, 3 insertions(+), 4 deletions(-) rename README.markdown => README.md (100%) diff --git a/Gemfile b/Gemfile index f7560c1..0e395e7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,4 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org' -gem 'pdk', git: 'https://github.com/puppetlabs/pdk.git', branch: 'master' def location_for(place_or_version, fake_version = nil) git_url_regex = %r{\A(?(https?|git)[:@][^#]*)(#(?.*))?} diff --git a/README.markdown b/README.md similarity index 100% rename from README.markdown rename to README.md diff --git a/metadata.json b/metadata.json index 9d997ab..90d308a 100644 --- a/metadata.json +++ b/metadata.json @@ -79,7 +79,7 @@ "version_requirement": ">= 5.5.10 < 7.0.0" } ], - "template-url": "https://github.com/puppetlabs/pdk-templates/#master", - "template-ref": "1.14.1-0-g0b5b39b", - "pdk-version": "1.14.0" + "template-url": "https://github.com/puppetlabs/pdk-templates#master", + "template-ref": "heads/master-0-gfaf9e8b", + "pdk-version": "1.14.1" }