Skip to content

Commit 6739faf

Browse files
authored
Merge pull request #306 from david22swan/IAC-835
(IAC-835) Support added for Debian 10 and CentOS/RHEL 8
2 parents 6c03bfa + 6b7b6ea commit 6739faf

File tree

5 files changed

+37
-13
lines changed

5 files changed

+37
-13
lines changed

.sync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
provision_list:
1616
- travis_deb
1717
- travis_ub
18-
- travis_el
18+
- travis_el7
1919
includes:
2020
- os: osx
2121
env: PUPPET_GEM_VERSION="~> 6.0" CHECK=parallel_spec

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
stage: acceptance
4141
-
4242
before_script:
43-
- "bundle exec rake 'litmus:provision_list[travis_el]'"
43+
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
4444
- "bundle exec rake 'litmus:install_agent[puppet5]'"
4545
- "bundle exec rake litmus:install_module"
4646
bundler_args:
47-
env: PLATFORMS=travis_el_puppet5
47+
env: PLATFORMS=travis_el7_puppet5
4848
rvm: 2.5.7
4949
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
5050
services: docker
@@ -73,11 +73,11 @@ jobs:
7373
stage: acceptance
7474
-
7575
before_script:
76-
- "bundle exec rake 'litmus:provision_list[travis_el]'"
76+
- "bundle exec rake 'litmus:provision_list[travis_el7]'"
7777
- "bundle exec rake 'litmus:install_agent[puppet6]'"
7878
- "bundle exec rake litmus:install_module"
7979
bundler_args:
80-
env: PLATFORMS=travis_el_puppet6
80+
env: PLATFORMS=travis_el7_puppet6
8181
rvm: 2.5.7
8282
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
8383
services: docker

metadata.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@
3131
{
3232
"operatingsystem": "CentOS",
3333
"operatingsystemrelease": [
34-
"7"
34+
"7",
35+
"8"
3536
]
3637
},
3738
{
3839
"operatingsystem": "Debian",
3940
"operatingsystemrelease": [
4041
"8",
41-
"9"
42+
"9",
43+
"10"
4244
]
4345
},
4446
{
@@ -59,7 +61,8 @@
5961
{
6062
"operatingsystem": "RedHat",
6163
"operatingsystemrelease": [
62-
"7"
64+
"7",
65+
"8"
6366
]
6467
},
6568
{

provision.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@ vagrant:
77
images: ['centos/7', 'generic/ubuntu1804', 'generic/debian8', 'gusztavvargadr/windows-server']
88
travis_deb:
99
provisioner: docker
10-
images: ['waffleimage/debian8', 'waffleimage/debian9']
10+
images: ['litmusimage/debian:8', 'litmusimage/debian:9', 'litmusimage/debian:10']
1111
travis_ub:
1212
provisioner: docker
13-
images: ['waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
14-
travis_el:
13+
images: ['litmusimage/ubuntu:16.04', 'litmusimage/ubuntu:18.04']
14+
travis_el6:
1515
provisioner: docker
16-
images: ['waffleimage/centos7']
16+
images: []
17+
travis_el7:
18+
provisioner: docker
19+
images: ['litmusimage/centos:7']
1720
release_checks:
1821
provisioner: abs
19-
images: ['redhat-7-x86_64', 'redhat-8-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'win-2012r2-x86_64', 'win-2016-core-x86_64', 'win-2019-core-x86_64']
22+
images: ['redhat-7-x86_64', 'redhat-8-x86_64', 'centos-7-x86_64', 'centos-8-x86_64', 'debian-8-x86_64', 'debian-9-x86_64', 'debian-10-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64', 'win-2012r2-x86_64', 'win-2016-core-x86_64', 'win-2019-core-x86_64']
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Install system components
2+
apt-get update
3+
apt-get install -y curl gnupg apt-transport-https
4+
5+
# Import the public repository GPG keys
6+
curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
7+
8+
# Register the Microsoft Product feed
9+
sh -c 'echo "deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-debian-buster-prod buster main" > /etc/apt/sources.list.d/microsoft.list'
10+
11+
# Update the list of products
12+
apt-get update
13+
14+
# Install PowerShell
15+
apt-get install -y powershell
16+
17+
# List version
18+
pwsh -v

0 commit comments

Comments
 (0)