Remove Ubuntu 18.04 and 16.04 from tests

signalfx · Jan 15, 2025 · b5a7095 · b5a7095
1 parent eb468ee
commit b5a7095
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 94 deletions.
diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
@@ -75,14 +75,8 @@ jobs:
           - debian11
           - debian12
           - opensuse12
-          - ubuntu1604
-          - ubuntu1804
           - ubuntu2004
           - ubuntu2204
-        exclude:
-          # 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
-          - distro: ubuntu1604
-            ansible: ansible~=9.2.0
 
     steps:
       - name: Check out the codebase.

diff --git a/deployments/chef/kitchen.yml b/deployments/chef/kitchen.yml
@@ -98,11 +98,6 @@ platforms:
       image: dokken/oraclelinux-8
       pid_one_command: /usr/lib/systemd/systemd
 
-  - name: ubuntu-18.04
-    driver:
-      image: dokken/ubuntu-18.04
-      pid_one_command: /bin/systemd
-
   - name: ubuntu-20.04
     driver:
       image: dokken/ubuntu-20.04

diff --git a/deployments/chef/spec/unit/recipes/default_spec.rb b/deployments/chef/spec/unit/recipes/default_spec.rb
@@ -10,7 +10,7 @@
   context 'on the Linux platform family' do
     context 'on debian-family distro' do
       cached(:chef_run) do
-        ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '16.04') do |node|
+        ChefSpec::SoloRunner.new(platform: 'ubuntu', version: '22.04') do |node|
           node.normal['splunk_otel_collector'] = {
             'splunk_access_token' => 'test123',
             'splunk_realm' => 'test',

diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic
diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial
diff --git a/packaging/tests/deployments/salt/images/distro_docker_opts.yaml b/packaging/tests/deployments/salt/images/distro_docker_opts.yaml
@@ -2,7 +2,6 @@ deb:
   debian-bullseye: ["DISTRO_IMAGE=debian:bullseye"]
   debian-buster: ["DISTRO_IMAGE=debian:buster"]
   debian-stretch: ["DISTRO_IMAGE=debian:stretch"]
-  ubunu-bionic: ["DISTRO_IMAGE=ubuntu:18.04"]
   ubuntu-focal: ["DISTRO_IMAGE=ubuntu:20.04"]
   ubuntu-jammy: ["DISTRO_IMAGE=ubuntu:22.04"]