From 6cda8ef5bab9d7e14f8db90d4967311097f96b7d Mon Sep 17 00:00:00 2001 From: David Swan Date: Fri, 10 Jan 2020 15:58:46 +0000 Subject: [PATCH] (FM-8581) - Debian 10 added to travis and provision file refactored --- .sync.yml | 60 ++++++++++++++++++++++++++++++++++++++++++++++---- .travis.yml | 46 ++++++++++++++++++++++++++++++++++---- provision.yaml | 18 ++++++++++----- 3 files changed, 110 insertions(+), 14 deletions(-) diff --git a/.sync.yml b/.sync.yml index 9fa053e..97c09a4 100644 --- a/.sync.yml +++ b/.sync.yml @@ -35,10 +35,11 @@ services: docker - bundler_args: dist: trusty - env: PLATFORMS=el_puppet5 + env: PLATFORMS=ub_puppet5 rvm: 2.5.1 before_script: - - bundle exec rake 'litmus:provision_list[travis_el]' + - bundle exec rake 'litmus:provision_list[travis_ub]' + - 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: @@ -48,10 +49,61 @@ stage: acceptance - bundler_args: dist: trusty - env: PLATFORMS=el_puppet6 + env: PLATFORMS=ub_puppet6 rvm: 2.5.1 before_script: - - bundle exec rake 'litmus:provision_list[travis_el]' + - bundle exec rake 'litmus:provision_list[travis_ub]' + - 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=el6_puppet5 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_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 + stage: acceptance + - bundler_args: + dist: trusty + env: PLATFORMS=el6_puppet6 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_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 + stage: acceptance + - bundler_args: + dist: trusty + env: PLATFORMS=el7_puppet5 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_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 + stage: acceptance + - bundler_args: + dist: trusty + env: PLATFORMS=el7_puppet6 + rvm: 2.5.1 + before_script: + - bundle exec rake 'litmus:provision_list[travis_el7]' - bundle exec rake 'litmus:install_agent[puppet6]' - bundle exec rake litmus:install_module script: diff --git a/.travis.yml b/.travis.yml index d145c70..0f046ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,20 +52,58 @@ matrix: script: ["bundle exec rake litmus:acceptance:parallel"] services: docker - - before_script: ["bundle exec rake 'litmus:provision_list[travis_el]'", "bundle exec rake 'litmus:install_agent[puppet5]'", "bundle exec rake litmus:install_module"] + before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "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: dist: trusty - env: PLATFORMS=el_puppet5 + env: PLATFORMS=ub_puppet5 rvm: 2.5.1 script: ["bundle exec rake litmus:acceptance:parallel"] services: docker stage: acceptance sudo: required - - before_script: ["bundle exec rake 'litmus:provision_list[travis_el]'", "bundle exec rake 'litmus:install_agent[puppet6]'", "bundle exec rake litmus:install_module"] + before_script: ["bundle exec rake 'litmus:provision_list[travis_ub]'", "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"] bundler_args: dist: trusty - env: PLATFORMS=el_puppet6 + env: PLATFORMS=ub_puppet6 + rvm: 2.5.1 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + - + before_script: ["bundle exec rake 'litmus:provision_list[travis_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.1 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + sudo: required + - + before_script: ["bundle exec rake 'litmus:provision_list[travis_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.1 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + sudo: required + - + 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: + dist: trusty + env: PLATFORMS=el7_puppet5 + rvm: 2.5.1 + script: ["bundle exec rake litmus:acceptance:parallel"] + services: docker + stage: acceptance + sudo: required + - + 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: + dist: trusty + env: PLATFORMS=el7_puppet6 rvm: 2.5.1 script: ["bundle exec rake litmus:acceptance:parallel"] services: docker diff --git a/provision.yaml b/provision.yaml index 900d54f..6ac1acc 100644 --- a/provision.yaml +++ b/provision.yaml @@ -2,15 +2,21 @@ default: provisioner: docker images: ['waffleimage/debian8'] -travis_deb: - provisioner: docker - images: ['debian:8', 'debian:9', 'ubuntu:14.04', 'ubuntu:16.04', 'ubuntu:18.04'] -travis_el: - provisioner: docker_exp - images: ['centos:6', 'centos:7', 'oraclelinux:6', 'oraclelinux:7', 'scientificlinux/sl:6', 'scientificlinux/sl:7'] vagrant: provisioner: vagrant images: ['centos/7', 'generic/ubuntu1804'] +travis_deb: + provisioner: docker + images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/debian10'] +travis_ub: + provisioner: docker + images: ['waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04'] +travis_el6: + provisioner: docker + images: ['waffleimage/centos6', 'waffleimage/oraclelinux6', 'waffleimage/scientificlinux6'] +travis_el7: + provisioner: docker + images: ['waffleimage/centos7', 'waffleimage/oraclelinux7', 'waffleimage/scientificlinux7'] release_checks: provisioner: vmpooler images: ['redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-6-x86_64', 'oracle-7-x86_64', 'scientific-6-x86_64', 'scientific-7-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'sles-11-x86_64', 'sles-12-x86_64', 'sles-15-x86_64']