Skip to content

Commit 8e3cd83

Browse files
author
David Swan
committed
(IAC-746) - Add ubuntu 20.04 support
1 parent 185b4de commit 8e3cd83

File tree

6 files changed

+85
-30
lines changed

6 files changed

+85
-30
lines changed

‎.github/workflows/release.yml

+22-3
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

+22-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- cron: '0 7 * * 6'
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

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

‎.travis.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -29,66 +29,66 @@ jobs:
2929
include:
3030
-
3131
before_script:
32-
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
33-
- "bundle exec rake 'litmus:install_agent[puppet5]'"
32+
- "bundle exec rake 'litmus:provision_list[travis_ub_6]'"
33+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
3434
- "bundle exec rake litmus:install_module"
3535
bundler_args:
36-
env: PLATFORMS=travis_deb_puppet5
36+
env: PLATFORMS=travis_ub_6_puppet6
3737
rvm: 2.5.7
3838
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
3939
services: docker
4040
stage: acceptance
4141
-
4242
before_script:
43-
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
43+
- "bundle exec rake 'litmus:provision_list[travis_ub_5]'"
4444
- "bundle exec rake 'litmus:install_agent[puppet5]'"
4545
- "bundle exec rake litmus:install_module"
4646
bundler_args:
47-
env: PLATFORMS=travis_ub_puppet5
47+
env: PLATFORMS=travis_ub_5_puppet5
4848
rvm: 2.5.7
4949
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
5050
services: docker
5151
stage: acceptance
5252
-
5353
before_script:
54-
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
54+
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
5555
- "bundle exec rake 'litmus:install_agent[puppet5]'"
5656
- "bundle exec rake litmus:install_module"
5757
bundler_args:
58-
env: PLATFORMS=travis_el6_puppet5
58+
env: PLATFORMS=travis_deb_puppet5
5959
rvm: 2.5.7
6060
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
6161
services: docker
6262
stage: acceptance
6363
-
6464
before_script:
65-
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
65+
- "bundle exec rake 'litmus:provision_list[travis_el6]'"
6666
- "bundle exec rake 'litmus:install_agent[puppet5]'"
6767
- "bundle exec rake litmus:install_module"
6868
bundler_args:
69-
env: PLATFORMS=travis_el7_puppet5
69+
env: PLATFORMS=travis_el6_puppet5
7070
rvm: 2.5.7
7171
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
7272
services: docker
7373
stage: acceptance
7474
-
7575
before_script:
76-
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
77-
- "bundle exec rake 'litmus:install_agent[puppet6]'"
76+
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
77+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
7878
- "bundle exec rake litmus:install_module"
7979
bundler_args:
80-
env: PLATFORMS=travis_deb_puppet6
80+
env: PLATFORMS=travis_el7_puppet5
8181
rvm: 2.5.7
8282
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
8383
services: docker
8484
stage: acceptance
8585
-
8686
before_script:
87-
- "bundle exec rake 'litmus:provision_list[travis_ub]'"
87+
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
8888
- "bundle exec rake 'litmus:install_agent[puppet6]'"
8989
- "bundle exec rake litmus:install_module"
9090
bundler_args:
91-
env: PLATFORMS=travis_ub_puppet6
91+
env: PLATFORMS=travis_deb_puppet6
9292
rvm: 2.5.7
9393
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
9494
services: docker

‎metadata.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@
6666
"operatingsystemrelease": [
6767
"14.04",
6868
"16.04",
69-
"18.04"
69+
"18.04",
70+
"20.04"
7071
]
7172
},
7273
{
@@ -92,6 +93,6 @@
9293
],
9394
"description": "NTP Module for Debian, Ubuntu, CentOS, RHEL, OEL, Fedora, FreeBSD, ArchLinux, Amazon Linux and Gentoo.",
9495
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
95-
"template-ref": "heads/master-0-g095317c",
96+
"template-ref": "heads/master-0-g88b05c7",
9697
"pdk-version": "1.17.0"
9798
}

‎provision.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,21 @@ vagrant:
88
travis_deb:
99
provisioner: docker_exp
1010
images: ['litmusimage/debian:8', 'litmusimage/debian:9', 'litmusimage/debian:10']
11-
travis_ub:
12-
provisioner: docker_exp
11+
travis_ub_5:
12+
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/ubuntu:20.04']
1417
travis_el6:
1518
provisioner: docker_exp
1619
images: ['litmusimage/centos:6', 'litmusimage/scientificlinux:6']
1720
travis_el7:
1821
provisioner: docker_exp
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', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-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', 'sles-15-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', 'centos-5-x86_64', 'centos-6-x86_64', 'centos-7-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', 'sles-15-x86_64', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'ubuntu-2004-x86_64']

0 commit comments

Comments
 (0)