Skip to content

Commit 4dac30a

Browse files
author
David Swan
committed
(IAC-746) - Add ubuntu 20.04 support
1 parent 8bfbbb5 commit 4dac30a

File tree

7 files changed

+96
-21
lines changed

7 files changed

+96
-21
lines changed

‎.github/workflows/release.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release'
77

88
jobs:
9-
LitmusAcceptance:
9+
LitmusAcceptancePuppet5:
1010
env:
1111
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
1212
HONEYCOMB_DATASET: litmus tests
@@ -15,8 +15,27 @@ jobs:
1515
matrix:
1616
ruby_version: [2.5.x]
1717
puppet_gem_version: [~> 6.0]
18-
platform: [release_checks]
19-
agent_family: ['puppet5', 'puppet6']
18+
platform: [release_checks_5]
19+
agent_family: ['puppet5']
20+
21+
steps:
22+
- uses: actions/checkout@v1
23+
- name: Litmus Parallel
24+
uses: puppetlabs/action-litmus_parallel@master
25+
with:
26+
platform: ${{ matrix.platform }}
27+
agent_family: ${{ matrix.agent_family }}
28+
LitmusAcceptancePuppet6:
29+
env:
30+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
31+
HONEYCOMB_DATASET: litmus tests
32+
runs-on: self-hosted
33+
strategy:
34+
matrix:
35+
ruby_version: [2.5.x]
36+
puppet_gem_version: [~> 6.0]
37+
platform: [release_checks_6]
38+
agent_family: ['puppet6']
2039

2140
steps:
2241
- uses: actions/checkout@v1

‎.github/workflows/weekly.yml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- cron: '0 3 * * 1'
66

77
jobs:
8-
LitmusAcceptance:
8+
LitmusAcceptancePuppet5:
99
env:
1010
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
1111
HONEYCOMB_DATASET: litmus tests
@@ -14,8 +14,27 @@ jobs:
1414
matrix:
1515
ruby_version: [2.5.x]
1616
puppet_gem_version: [~> 6.0]
17-
platform: [release_checks]
18-
agent_family: ['puppet5', 'puppet6']
17+
platform: [release_checks_5]
18+
agent_family: ['puppet5']
19+
20+
steps:
21+
- uses: actions/checkout@v1
22+
- name: Litmus Parallel
23+
uses: puppetlabs/action-litmus_parallel@master
24+
with:
25+
platform: ${{ matrix.platform }}
26+
agent_family: ${{ matrix.agent_family }}
27+
LitmusAcceptancePuppet6:
28+
env:
29+
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
30+
HONEYCOMB_DATASET: litmus tests
31+
runs-on: self-hosted
32+
strategy:
33+
matrix:
34+
ruby_version: [2.5.x]
35+
puppet_gem_version: [~> 6.0]
36+
platform: [release_checks_6]
37+
agent_family: ['puppet6']
1938

2039
steps:
2140
- uses: actions/checkout@v1

‎.sync.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,21 @@
1313
use_litmus: true
1414
litmus:
1515
provision_list:
16-
- travis_deb
17-
- travis_ub
18-
- travis_el6
19-
- travis_el7
20-
- ---travis_el
16+
- ---travis_el7
17+
- travis_deb
18+
- travis_el6
19+
- travis_el7
20+
complex:
21+
- collection:
22+
puppet_collection:
23+
- puppet6
24+
provision_list:
25+
- travis_ub_6
26+
- collection:
27+
puppet_collection:
28+
- puppet5
29+
provision_list:
30+
- travis_ub_5
2131
simplecov: true
2232
notifications:
2333
slack:

‎.travis.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,28 @@ stages:
2727
jobs:
2828
fast_finish: true
2929
include:
30+
-
31+
before_script:
32+
- "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
33+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
34+
- "bundle exec rake litmus:install_module"
35+
bundler_args:
36+
env: PLATFORMS=travis_ub_6_puppet6
37+
rvm: 2.5.7
38+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
39+
services: docker
40+
stage: acceptance
41+
-
42+
before_script:
43+
- "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
44+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
45+
- "bundle exec rake litmus:install_module"
46+
bundler_args:
47+
env: PLATFORMS=travis_ub_5_puppet5
48+
rvm: 2.5.7
49+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
50+
services: docker
51+
stage: acceptance
3052
-
3153
before_script:
3254
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
@@ -40,11 +62,11 @@ jobs:
4062
stage: acceptance
4163
-
4264
before_script:
43-
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
65+
- "bundle exec rake 'litmus:provision_list[travis_el]'"
4466
- "bundle exec rake 'litmus:install_agent[puppet5]'"
4567
- "bundle exec rake litmus:install_module"
4668
bundler_args:
47-
env: PLATFORMS=travis_ub_puppet5
69+
env: PLATFORMS=travis_el_puppet5
4870
rvm: 2.5.7
4971
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
5072
services: docker
@@ -84,11 +106,11 @@ jobs:
84106
stage: acceptance
85107
-
86108
before_script:
87-
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
109+
- "bundle exec rake 'litmus:provision_list[travis_el]'"
88110
- "bundle exec rake 'litmus:install_agent[puppet6]'"
89111
- "bundle exec rake litmus:install_module"
90112
bundler_args:
91-
env: PLATFORMS=travis_ub_puppet6
113+
env: PLATFORMS=travis_el_puppet6
92114
rvm: 2.5.7
93115
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
94116
services: docker

‎Gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ group :development do
2929
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3030
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
32-
gem 'ed25519', '>= 1.2', '< 2.0'
33-
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
3432
end
3533

3634
puppet_version = ENV['PUPPET_GEM_VERSION']

‎metadata.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"operatingsystemrelease": [
7777
"14.04",
7878
"16.04",
79-
"18.04"
79+
"18.04",
80+
"20.04"
8081
]
8182
}
8283
],
@@ -88,5 +89,5 @@
8889
],
8990
"pdk-version": "1.17.0",
9091
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
91-
"template-ref": "heads/master-0-g095317c"
92+
"template-ref": "heads/master-0-g88b05c7"
9293
}

‎provision.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,21 @@ vagrant:
88
travis_deb:
99
provisioner: docker
1010
images: ['litmusimage/debian:8', 'litmusimage/debian:9', 'litmusimage/debian:10']
11-
travis_ub:
11+
travis_ub_5:
1212
provisioner: docker
1313
images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
14+
travis_ub_6:
15+
provisioner: docker
16+
images: ['litmusimage/ubuntu:14.04', 'litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04', 'litmusimage/ubuntu20.04']
1417
travis_el6:
1518
provisioner: docker
1619
images: ['litmusimage/centos:6', 'litmusimage/scientificlinux:6']
1720
travis_el7:
1821
provisioner: docker
1922
images: ['litmusimage/centos:7', 'litmusimage/oraclelinux:7', 'litmusimage/scientificlinux:7']
20-
release_checks:
23+
release_checks_5:
2124
provisioner: abs
2225
images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-5-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', 'sles-11-x86_64', 'sles-12-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
26+
release_checks_6:
27+
provisioner: abs
28+
images: ['redhat-5-x86_64', 'redhat-6-x86_64', 'redhat-7-x86_64', 'redhat-8-x86_64', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'oracle-5-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', 'sles-11-x86_64', 'sles-12-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64']

0 commit comments

Comments
 (0)