Skip to content

Commit 86d7f6a

Browse files
authored
Merge pull request #1253 from puppetlabs/pdksync_remove_ubuntu14_support
pdksync - FM-8499 - remove ubuntu14 support
2 parents 656a0d8 + 022a079 commit 86d7f6a

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Diff for: metadata.json

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
{
7070
"operatingsystem": "Ubuntu",
7171
"operatingsystemrelease": [
72-
"14.04",
7372
"16.04",
7473
"18.04"
7574
]

Diff for: provision.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ default:
44
images: ['waffleimage/centos7']
55
travis_deb:
66
provisioner: docker
7-
images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu14.04', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
7+
images: ['waffleimage/debian8', 'waffleimage/debian9', 'waffleimage/ubuntu16.04', 'waffleimage/ubuntu18.04']
88
travis_el6:
99
provisioner: docker_exp
1010
images: ['waffleimage/centos6', 'waffleimage/scientificlinux6']
@@ -16,4 +16,4 @@ vagrant:
1616
images: ['centos/7', 'generic/ubuntu1804']
1717
release_checks:
1818
provisioner: vmpooler
19-
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', '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', 'ubuntu-1404-x86_64', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']
19+
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', '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', 'ubuntu-1604-x86_64', 'ubuntu-1804-x86_64']

0 commit comments

Comments
 (0)