From ee18c22bbaa42a266dba1bcbe8ff7d7fabf4845b Mon Sep 17 00:00:00 2001 From: adrianiurca Date: Wed, 25 Nov 2020 20:25:50 +0200 Subject: [PATCH] (pdksync) - implement centos 8 on travis --- .sync.yml | 7 +++-- .travis.yml | 74 ++++++++++++++++++++++++++++----------------------- metadata.json | 4 +-- 3 files changed, 46 insertions(+), 39 deletions(-) diff --git a/.sync.yml b/.sync.yml index f79d858..05a7873 100644 --- a/.sync.yml +++ b/.sync.yml @@ -12,10 +12,9 @@ use_litmus: true litmus: provision_list: - - ---travis_el - - travis_deb - - travis_el7 - - travis_el8 + - ---travis_el + - travis_deb + - travis_el7 complex: - collection: puppet_collection: diff --git a/.travis.yml b/.travis.yml index aa26f24..f5a95c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - gem --version - bundle -v script: - - "SIMPLECOV=yes bundle exec rake $CHECK" + - 'SIMPLECOV=yes bundle exec rake $CHECK' bundler_args: --without system_tests rvm: - 2.5.7 @@ -27,20 +27,22 @@ stages: jobs: fast_finish: true include: - - before_script: - - "bundle exec rake 'litmus:provision_list[travis_ub_6]'" - - "bundle exec rake 'litmus:install_agent[puppet6]'" - - "bundle exec rake litmus:install_module" + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_ub_6]'" + - "bundle exec rake 'litmus:install_agent[puppet6]'" + - "bundle exec rake litmus:install_module" bundler_args: env: PLATFORMS=travis_ub_6_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_ub_5]'" - - "bundle exec rake 'litmus:install_agent[puppet5]'" - - "bundle exec rake litmus:install_module" + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_ub_5]'" + - "bundle exec rake 'litmus:install_agent[puppet5]'" + - "bundle exec rake litmus:install_module" bundler_args: env: PLATFORMS=travis_ub_5_puppet5 rvm: 2.5.7 @@ -49,9 +51,9 @@ jobs: 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" + - "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 @@ -61,9 +63,9 @@ jobs: 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" + - "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 @@ -73,51 +75,57 @@ jobs: stage: acceptance - before_script: - - "bundle exec rake 'litmus:provision_list[travis_deb]'" - - "bundle exec rake 'litmus:install_agent[puppet5]'" - - "bundle exec rake litmus:install_module" + - "bundle exec rake 'litmus:provision_list[travis_deb]'" + - "bundle exec rake 'litmus:install_agent[puppet5]'" + - "bundle exec rake litmus:install_module" bundler_args: env: PLATFORMS=travis_deb_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_el7]'" - - "bundle exec rake 'litmus:install_agent[puppet5]'" - - "bundle exec rake litmus:install_module" + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_el7]'" + - "bundle exec rake 'litmus:install_agent[puppet5]'" + - "bundle exec rake litmus:install_module" bundler_args: env: PLATFORMS=travis_el7_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_deb]'" - - "bundle exec rake 'litmus:install_agent[puppet6]'" - - "bundle exec rake litmus:install_module" + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_deb]'" + - "bundle exec rake 'litmus:install_agent[puppet6]'" + - "bundle exec rake litmus:install_module" bundler_args: env: PLATFORMS=travis_deb_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_el7]'" - - "bundle exec rake 'litmus:install_agent[puppet6]'" - - "bundle exec rake litmus:install_module" + - + before_script: + - "bundle exec rake 'litmus:provision_list[travis_el7]'" + - "bundle exec rake 'litmus:install_agent[puppet6]'" + - "bundle exec rake litmus:install_module" bundler_args: env: PLATFORMS=travis_el7_puppet6 rvm: 2.5.7 script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"] services: docker stage: acceptance - - env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint" + - + 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 + - + env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec rvm: 2.4.5 stage: spec - - env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec + - + env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec rvm: 2.5.7 stage: spec branches: diff --git a/metadata.json b/metadata.json index 97ebf78..d165edc 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#adrianiurca-allow-use-dist-locally", - "template-ref": "remotes/origin/adrianiurca-allow-use-dist-locally-0-g55e608a", + "template-url": "https://github.com/puppetlabs/pdk-templates#main", + "template-ref": "heads/main-0-gd9b4054", "pdk-version": "1.18.1" } -- 2.45.2