Skip to content

Commit 230befd

Browse files
authored
Remove Ubuntu 18.04 and 16.04 from tests (#5806)
1 parent 4c4fda7 commit 230befd

File tree

6 files changed

+1
-94
lines changed

6 files changed

+1
-94
lines changed

.github/workflows/ansible.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,8 @@ jobs:
7272
- debian11
7373
- debian12
7474
- opensuse12
75-
- ubuntu1604
76-
- ubuntu1804
7775
- ubuntu2004
7876
- ubuntu2204
79-
exclude:
80-
# ansible-core used by ansible 9.2.0 requires a minimum of Python2 version 2.7 or Python3 version 3.6. Current version: 3.5.2
81-
- distro: ubuntu1604
82-
ansible: ansible~=9.2.0
8377

8478
steps:
8579
- name: Check out the codebase.

deployments/chef/kitchen.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ platforms:
8585
image: dokken/oraclelinux-8
8686
pid_one_command: /usr/lib/systemd/systemd
8787

88-
- name: ubuntu-18.04
89-
driver:
90-
image: dokken/ubuntu-18.04
91-
pid_one_command: /bin/systemd
92-
9388
- name: ubuntu-20.04
9489
driver:
9590
image: dokken/ubuntu-20.04

deployments/chef/spec/unit/recipes/default_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
context 'on the Linux platform family' do
1111
context 'on debian-family distro' do
1212
cached(:chef_run) do
13-
ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '16.04') do |node|
13+
ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '22.04') do |node|
1414
node.normal['splunk_otel_collector'] = {
1515
'splunk_access_token' => 'test123',
1616
'splunk_realm' => 'test',

packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic

Lines changed: 0 additions & 43 deletions
This file was deleted.

packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial

Lines changed: 0 additions & 38 deletions
This file was deleted.

packaging/tests/deployments/salt/images/distro_docker_opts.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
deb:
22
debian-bullseye: ["DISTRO_IMAGE=debian:bullseye"]
3-
ubunu-bionic: ["DISTRO_IMAGE=ubuntu:18.04"]
43
ubuntu-focal: ["DISTRO_IMAGE=ubuntu:20.04"]
54
ubuntu-jammy: ["DISTRO_IMAGE=ubuntu:22.04"]
65

0 commit comments

Comments
 (0)