From fb2c36ee3f174d7b66b490c43cb34e3b136b51e1 Mon Sep 17 00:00:00 2001 From: William Bradford Clark Date: Mon, 11 May 2020 12:20:11 -0400 Subject: [PATCH] Fixes #29735 - support el8 --- .sync.yml | 1 + .travis.yml | 22 ++++++++++++++++++++++ metadata.json | 6 ++++-- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.sync.yml b/.sync.yml index 2c9f265e..60ae1390 100644 --- a/.sync.yml +++ b/.sync.yml @@ -2,6 +2,7 @@ .travis.yml: beaker_sets: - centos6-64 + - centos8-64 - debian9-64 - debian10-64 - ubuntu1804-64 diff --git a/.travis.yml b/.travis.yml index bfbacec6..75d36427 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,28 @@ matrix: - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json - sudo service docker restart + - rvm: 2.5.1 + env: + - BEAKER_PUPPET_COLLECTION=puppet5 + - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com} + script: bundle exec rake beaker + services: docker + bundler_args: --without development + before_install: + - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json + - sudo service docker restart + + - rvm: 2.5.1 + env: + - BEAKER_PUPPET_COLLECTION=puppet6 + - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com} + script: bundle exec rake beaker + services: docker + bundler_args: --without development + before_install: + - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json + - sudo service docker restart + - rvm: 2.5.1 env: - BEAKER_PUPPET_COLLECTION=puppet5 diff --git a/metadata.json b/metadata.json index f341957d..ab6f49db 100644 --- a/metadata.json +++ b/metadata.json @@ -43,14 +43,16 @@ "operatingsystem": "RedHat", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "6", - "7" + "7", + "8" ] }, {