From 625524d0986f83a04979a0b2d6d009f5b4b7a172 Mon Sep 17 00:00:00 2001 From: adrianiurca Date: Wed, 25 Nov 2020 18:44:27 +0200 Subject: [PATCH] (pdksync) - implement centos 8 on travis --- .sync.yml | 50 +++++++++++++++++++++++++++++++------------------- .travis.yml | 24 ++++++++++++++++++++++++ metadata.json | 4 ++-- 3 files changed, 57 insertions(+), 21 deletions(-) diff --git a/.sync.yml b/.sync.yml index 0e6670d..05a7873 100644 --- a/.sync.yml +++ b/.sync.yml @@ -3,29 +3,41 @@ delete: true ".travis.yml": dist: trusty # acceptance tests have stopped working on newer versions - probably related to docker behaviour - global_env: + global_env: - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests" deploy_to_forge: enabled: false branches: - - release + - release use_litmus: true litmus: provision_list: - - ---travis_el - - travis_deb - - travis_el7 + - ---travis_el + - travis_deb + - travis_el7 complex: - - collection: - puppet_collection: - - puppet6 - provision_list: - - travis_ub_6 - - collection: - puppet_collection: - - puppet5 - provision_list: - - travis_ub_5 + - collection: + puppet_collection: + - puppet6 + provision_list: + - travis_ub_6 + - collection: + puppet_collection: + - puppet5 + provision_list: + - travis_ub_5 + - collection: + puppet_collection: + - puppet5 + provision_list: + - travis_el8 + dist: xenial + - collection: + puppet_collection: + - puppet6 + provision_list: + - travis_el8 + dist: xenial simplecov: true notifications: slack: @@ -35,10 +47,10 @@ appveyor.yml: 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') + - 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" coverage_report: true diff --git a/.travis.yml b/.travis.yml index f9273b1..f5a95c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,6 +49,30 @@ jobs: script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"] services: docker stage: acceptance + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_el8]'" + - "bundle exec rake 'litmus:install_agent[puppet5]'" + - "bundle exec rake litmus:install_module" + bundler_args: + dist: xenial + env: PLATFORMS=travis_el8_puppet5 + rvm: 2.5.7 + script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_el8]'" + - "bundle exec rake 'litmus:install_agent[puppet6]'" + - "bundle exec rake litmus:install_module" + bundler_args: + dist: xenial + env: PLATFORMS=travis_el8_puppet6 + rvm: 2.5.7 + script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance - before_script: - "bundle exec rake 'litmus:provision_list[travis_deb]'" diff --git a/metadata.json b/metadata.json index ab43e18..97ebf78 100644 --- a/metadata.json +++ b/metadata.json @@ -78,7 +78,7 @@ "version_requirement": ">= 5.5.10 < 7.0.0" } ], - "template-url": "https://github.com/puppetlabs/pdk-templates#main", - "template-ref": "heads/main-0-g874030e", + "template-url": "https://github.com/puppetlabs/pdk-templates#adrianiurca-allow-use-dist-locally", + "template-ref": "remotes/origin/adrianiurca-allow-use-dist-locally-0-g55e608a", "pdk-version": "1.18.1" } -- 2.45.2