From b5a7095c29fc71437995cdde39a1a75b6a7d3150 Mon Sep 17 00:00:00 2001 From: Paulo Janotti Date: Tue, 14 Jan 2025 20:37:43 -0800 Subject: [PATCH] Remove Ubuntu 18.04 and 16.04 from tests --- .github/workflows/ansible.yml | 6 --- deployments/chef/kitchen.yml | 5 --- .../chef/spec/unit/recipes/default_spec.rb | 2 +- .../images/deb/Dockerfile.ubuntu-bionic | 43 ------------------- .../images/deb/Dockerfile.ubuntu-xenial | 38 ---------------- .../salt/images/distro_docker_opts.yaml | 1 - 6 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic delete mode 100644 packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml index a076865425..b7ccae9526 100644 --- 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 index 8e1124c292..996f41ca10 100644 --- 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 index c56b1eb58a..5a77e4a9e3 100644 --- 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 deleted file mode 100644 index f22a245ce2..0000000000 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-bionic +++ /dev/null @@ -1,43 +0,0 @@ -FROM ubuntu:18.04 - -RUN apt-get update &&\ - apt-get install -yq ca-certificates procps systemd wget apt-transport-https libcap2-bin curl gnupg lsb-release - -ARG PUPPET_RELEASE="6" -RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-bionic.deb && \ - dpkg -i puppet${PUPPET_RELEASE}-release-bionic.deb && \ - apt-get update && \ - apt-get install -y puppet-agent - -RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \ - mkdir -p /opt/ && \ - tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \ - mv /opt/node* /opt/node - -ENV PATH=/opt/puppetlabs/bin:/opt/node/bin:$PATH - -ENV container docker - -RUN rm -f /lib/systemd/system/multi-user.target.wants/* \ - /etc/systemd/system/*.wants/* \ - /lib/systemd/system/local-fs.target.wants/* \ - /lib/systemd/system/sockets.target.wants/*udev* \ - /lib/systemd/system/sockets.target.wants/*initctl* \ - /lib/systemd/system/systemd-update-utmp* - -RUN systemctl set-default multi-user.target -ENV init /lib/systemd/systemd - -RUN if [ $PUPPET_RELEASE -lt 8 ]; then \ - puppet module install puppetlabs-stdlib --version 4.24.0 && \ - puppet module install puppetlabs-apt --version 7.0.0; \ - else \ - puppet module install puppetlabs-stdlib --version 9.0.0 && \ - puppet module install puppetlabs-apt --version 9.1.0; \ - fi - -COPY deployments/puppet /etc/puppetlabs/code/environments/production/modules/splunk_otel_collector - -VOLUME [ "/sys/fs/cgroup" ] - -ENTRYPOINT ["/lib/systemd/systemd"] diff --git a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial b/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial deleted file mode 100644 index f844ea9030..0000000000 --- a/packaging/tests/deployments/puppet/images/deb/Dockerfile.ubuntu-xenial +++ /dev/null @@ -1,38 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update &&\ - apt-get install -yq ca-certificates procps systemd wget apt-transport-https libcap2-bin curl gnupg lsb-release - -ARG PUPPET_RELEASE="6" -RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-xenial.deb && \ - dpkg -i puppet${PUPPET_RELEASE}-release-xenial.deb && \ - apt-get update && \ - apt-get install -y puppet-agent - -RUN wget -O /tmp/nodejs.tar.gz https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.gz && \ - mkdir -p /opt/ && \ - tar -C /opt/ -xzf /tmp/nodejs.tar.gz && \ - mv /opt/node* /opt/node - -ENV PATH=/opt/puppetlabs/bin:/opt/node/bin:$PATH - -ENV container docker - -RUN rm -f /lib/systemd/system/multi-user.target.wants/* \ - /etc/systemd/system/*.wants/* \ - /lib/systemd/system/local-fs.target.wants/* \ - /lib/systemd/system/sockets.target.wants/*udev* \ - /lib/systemd/system/sockets.target.wants/*initctl* \ - /lib/systemd/system/systemd-update-utmp* - -RUN systemctl set-default multi-user.target -ENV init /lib/systemd/systemd - -RUN puppet module install puppetlabs-stdlib --version 4.24.0 -RUN puppet module install puppetlabs-apt --version 7.0.0 - -COPY deployments/puppet /etc/puppetlabs/code/environments/production/modules/splunk_otel_collector - -VOLUME [ "/sys/fs/cgroup" ] - -ENTRYPOINT ["/lib/systemd/systemd"] diff --git a/packaging/tests/deployments/salt/images/distro_docker_opts.yaml b/packaging/tests/deployments/salt/images/distro_docker_opts.yaml index 5c8ae3b3e4..85084b0e4f 100644 --- 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"]