From 6ec98aff2c57fb35a5d9b71d43814f7ca649e397 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Thu, 1 Dec 2022 07:18:56 -0800 Subject: [PATCH] remove debian jessie as the docker image used for testing is no longer valid (#2600) --- .../roles/signalfx-agent/meta/main.yml | 1 - tests/deployments/ansible/ansible_test.py | 1 - .../ansible/images/Dockerfile.debian-8-jessie | 31 -------------- tests/deployments/chef/chef_test.py | 3 +- .../chef/images/Dockerfile.debian-8-jessie | 40 ------------------- .../puppet/images/Dockerfile.debian-8-jessie | 31 -------------- tests/deployments/puppet/puppet_test.py | 1 - .../salt/images/Dockerfile.debian-8-jessie | 31 -------------- tests/deployments/salt/salt_test.py | 1 - .../images/Dockerfile.debian-8-jessie | 27 ------------- tests/packaging/installer_test.py | 1 - tests/packaging/package_test.py | 2 - 12 files changed, 1 insertion(+), 169 deletions(-) delete mode 100644 tests/deployments/ansible/images/Dockerfile.debian-8-jessie delete mode 100644 tests/deployments/chef/images/Dockerfile.debian-8-jessie delete mode 100644 tests/deployments/puppet/images/Dockerfile.debian-8-jessie delete mode 100644 tests/deployments/salt/images/Dockerfile.debian-8-jessie delete mode 100644 tests/packaging/images/Dockerfile.debian-8-jessie diff --git a/deployments/ansible/roles/signalfx-agent/meta/main.yml b/deployments/ansible/roles/signalfx-agent/meta/main.yml index f05d41afbf..fd64fd538a 100644 --- a/deployments/ansible/roles/signalfx-agent/meta/main.yml +++ b/deployments/ansible/roles/signalfx-agent/meta/main.yml @@ -19,7 +19,6 @@ galaxy_info: - name: Debian versions: - stretch - - jessie - name: Amazon - name: Windows galaxy_tags: diff --git a/tests/deployments/ansible/ansible_test.py b/tests/deployments/ansible/ansible_test.py index 2e2042086e..5bd1688b61 100644 --- a/tests/deployments/ansible/ansible_test.py +++ b/tests/deployments/ansible/ansible_test.py @@ -27,7 +27,6 @@ DOCKERFILES_DIR = Path(__file__).parent.joinpath("images").resolve() DEB_DISTROS = [ - ("debian-8-jessie", INIT_SYSTEMD), ("debian-9-stretch", INIT_SYSTEMD), ("ubuntu1604", INIT_SYSTEMD), ("ubuntu1804", INIT_SYSTEMD), diff --git a/tests/deployments/ansible/images/Dockerfile.debian-8-jessie b/tests/deployments/ansible/images/Dockerfile.debian-8-jessie deleted file mode 100644 index 690480622e..0000000000 --- a/tests/deployments/ansible/images/Dockerfile.debian-8-jessie +++ /dev/null @@ -1,31 +0,0 @@ -FROM debian:jessie-slim - -RUN apt-get update &&\ - apt-get install -yq ca-certificates procps wget apt-transport-https init-system-helpers curl python gnupg - -RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o /tmp/get-pip.py && \ - python /tmp/get-pip.py pip==20.3.4 - -ARG ANSIBLE_VERSION='==2.4.0' -RUN pip install ansible${ANSIBLE_VERSION} - -ENV container docker - -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -# Keep it from wiping our scratch dir in /tmp/scratch -RUN rm -f /usr/lib/tmpfiles.d/tmp.conf; - -COPY deployments/ansible/* /opt/playbook/ -COPY tests/deployments/ansible/images/inventory.ini /opt/playbook/ -COPY tests/deployments/ansible/images/playbook.yml /opt/playbook/ - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/sbin/init"] diff --git a/tests/deployments/chef/chef_test.py b/tests/deployments/chef/chef_test.py index 2244a2e778..3fbcdae8c0 100644 --- a/tests/deployments/chef/chef_test.py +++ b/tests/deployments/chef/chef_test.py @@ -59,7 +59,6 @@ DOCKERFILES_DIR = SCRIPT_DIR / "images" DEB_DISTROS = [ - ("debian-8-jessie", INIT_SYSTEMD), ("debian-9-stretch", INIT_SYSTEMD), ("ubuntu1404", INIT_UPSTART), ("ubuntu1604", INIT_SYSTEMD), @@ -158,7 +157,7 @@ def test_chef(base_image, init_system, chef_version): ), "Datapoints didn't come through" # downgrade agent for distros that support package downgrades - if base_image not in ("debian-7-wheezy", "debian-8-jessie", "ubuntu1404"): + if base_image not in ("debian-7-wheezy", "ubuntu1404"): agent_version = INITIAL_VERSION run_chef_client(cont, init_system, chef_version, agent_version, STAGE, monitors) backend.reset_datapoints() diff --git a/tests/deployments/chef/images/Dockerfile.debian-8-jessie b/tests/deployments/chef/images/Dockerfile.debian-8-jessie deleted file mode 100644 index 666d4a5cd1..0000000000 --- a/tests/deployments/chef/images/Dockerfile.debian-8-jessie +++ /dev/null @@ -1,40 +0,0 @@ -FROM debian:jessie-slim - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update &&\ - apt-get install -yq ca-certificates procps wget apt-transport-https init-system-helpers curl gnupg - -WORKDIR /opt/cookbooks -RUN curl -Lo windows.tar.gz https://supermarket.chef.io/cookbooks/windows/versions/4.3.4/download && \ - tar -xzf windows.tar.gz - -ARG CHEF_INSTALLER_ARGS -RUN curl -L https://omnitruck.chef.io/install.sh | bash -s -- $CHEF_INSTALLER_ARGS - -COPY tests/packaging/images/socat /bin/socat - -# Insert our fake certs to the system bundle so they are trusted -COPY tests/packaging/images/certs/*.signalfx.com.* / -RUN cat /*.cert >> /etc/ssl/certs/ca-certificates.crt - -ENV container docker - -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -# Keep it from wiping our scratch dir in /tmp/scratch -RUN rm -f /usr/lib/tmpfiles.d/tmp.conf; - -COPY deployments/chef /opt/cookbooks/signalfx_agent - -WORKDIR /opt - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/sbin/init"] diff --git a/tests/deployments/puppet/images/Dockerfile.debian-8-jessie b/tests/deployments/puppet/images/Dockerfile.debian-8-jessie deleted file mode 100644 index 8efa227aff..0000000000 --- a/tests/deployments/puppet/images/Dockerfile.debian-8-jessie +++ /dev/null @@ -1,31 +0,0 @@ -FROM debian:jessie-slim - -RUN apt-get update &&\ - apt-get install -yq ca-certificates procps wget apt-transport-https init-system-helpers curl gnupg - -ARG PUPPET_RELEASE="" -RUN wget https://apt.puppetlabs.com/puppet${PUPPET_RELEASE}-release-jessie.deb && \ - dpkg -i puppet${PUPPET_RELEASE}-release-jessie.deb && \ - apt-get update && \ - apt-get install -y puppet-agent - -ENV PATH=/opt/puppetlabs/bin:$PATH - -ENV container docker - -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -# Keep it from wiping our scratch dir in /tmp/scratch -RUN rm -f /usr/lib/tmpfiles.d/tmp.conf; - -COPY deployments/puppet /etc/puppetlabs/code/environments/production/modules/signalfx_agent - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/sbin/init"] diff --git a/tests/deployments/puppet/puppet_test.py b/tests/deployments/puppet/puppet_test.py index 5a2d854fe9..fe4ecdc768 100644 --- a/tests/deployments/puppet/puppet_test.py +++ b/tests/deployments/puppet/puppet_test.py @@ -39,7 +39,6 @@ APT_MODULE_VERSION = "7.0.0" DEB_DISTROS = [ - ("debian-8-jessie", INIT_SYSTEMD), ("debian-9-stretch", INIT_SYSTEMD), ("ubuntu1404", INIT_UPSTART), ("ubuntu1604", INIT_SYSTEMD), diff --git a/tests/deployments/salt/images/Dockerfile.debian-8-jessie b/tests/deployments/salt/images/Dockerfile.debian-8-jessie deleted file mode 100644 index 0089b548b2..0000000000 --- a/tests/deployments/salt/images/Dockerfile.debian-8-jessie +++ /dev/null @@ -1,31 +0,0 @@ -FROM debian:jessie-slim - -ENV DEBIAN_FRONTEND=noninteractive -ENV LANG C.UTF-8 -ENV LC_ALL C.UTF-8 - -RUN apt-get update &&\ - apt-get install -yq ca-certificates procps wget apt-transport-https init-system-helpers curl python3-apt python3-pip python3-dev python3-zmq gnupg - -RUN pip3 install msgpack==0.6.2 Jinja2==2.11.3 MarkupSafe==1.1.1 -RUN pip3 install salt==2019.2 - -ENV container docker -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -# Keep it from wiping our scratch dir in /tmp/scratch -RUN rm -f /usr/lib/tmpfiles.d/tmp.conf; - -COPY deployments/salt/signalfx-agent/ /srv/salt/signalfx-agent/ -COPY tests/deployments/salt/images/top.sls /srv/salt/top.sls -COPY tests/deployments/salt/images/top.sls /srv/pillar/top.sls -COPY tests/deployments/salt/images/minion /etc/salt/minion - -VOLUME [ "/sys/fs/cgroup" ] -CMD ["/sbin/init"] diff --git a/tests/deployments/salt/salt_test.py b/tests/deployments/salt/salt_test.py index 3631345ad3..a43442e9f7 100644 --- a/tests/deployments/salt/salt_test.py +++ b/tests/deployments/salt/salt_test.py @@ -26,7 +26,6 @@ DOCKERFILES_DIR = Path(__file__).parent.joinpath("images").resolve() DEB_DISTROS = [ - ("debian-8-jessie", INIT_SYSTEMD), ("debian-9-stretch", INIT_SYSTEMD), ("ubuntu1804", INIT_SYSTEMD), ] diff --git a/tests/packaging/images/Dockerfile.debian-8-jessie b/tests/packaging/images/Dockerfile.debian-8-jessie deleted file mode 100644 index 38a3075359..0000000000 --- a/tests/packaging/images/Dockerfile.debian-8-jessie +++ /dev/null @@ -1,27 +0,0 @@ -FROM debian:jessie-slim - -RUN apt-get update &&\ - apt-get install -yq ca-certificates procps wget init-system-helpers - -COPY socat /bin/socat - -# Insert our fake certs to the system bundle so they are trusted -COPY certs/*.signalfx.com.* / -RUN cat /*.cert >> /etc/ssl/certs/ca-certificates.crt - -ENV container docker - -RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i = \ - "systemd-tmpfiles-setup.service" ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -# Keep it from wiping our scratch dir in /tmp/scratch -RUN rm -f /usr/lib/tmpfiles.d/tmp.conf; - -VOLUME [ "/sys/fs/cgroup" ] - -CMD ["/sbin/init"] diff --git a/tests/packaging/installer_test.py b/tests/packaging/installer_test.py index db82db0ba0..43283df616 100644 --- a/tests/packaging/installer_test.py +++ b/tests/packaging/installer_test.py @@ -32,7 +32,6 @@ pytestmark = pytest.mark.installer DEB_DISTROS = [ - ("debian-8-jessie", INIT_SYSTEMD), ("debian-9-stretch", INIT_SYSTEMD), ("ubuntu1404", INIT_UPSTART), ("ubuntu1604", INIT_SYSTEMD), diff --git a/tests/packaging/package_test.py b/tests/packaging/package_test.py index 013fc4e8b0..582fb94a29 100644 --- a/tests/packaging/package_test.py +++ b/tests/packaging/package_test.py @@ -410,7 +410,6 @@ def test_rpm_package(base_image, init_system): @pytest.mark.parametrize( "base_image,init_system", [ - ("debian-8-jessie", INIT_SYSTEMD), ("debian-9-stretch", INIT_SYSTEMD), ("ubuntu1404", INIT_UPSTART), ("ubuntu1604", INIT_SYSTEMD), @@ -442,7 +441,6 @@ def test_rpm_package_upgrade(base_image, init_system): @pytest.mark.parametrize( "base_image,init_system", [ - ("debian-8-jessie", INIT_SYSTEMD), ("debian-9-stretch", INIT_SYSTEMD), ("ubuntu1404", INIT_UPSTART), ("ubuntu1604", INIT_SYSTEMD),