From 96fa78d6d099d0a48642d377d3e7f30a0c554bdf Mon Sep 17 00:00:00 2001 From: Charlie Mordant Date: Wed, 15 Apr 2020 17:07:33 +0200 Subject: [PATCH] remove deprecated machines --- .travis.yml | 9 --------- tests/Dockerfile.debian-jessie | 14 -------------- tests/Dockerfile.fedora-24 | 26 -------------------------- tests/Dockerfile.ubuntu-trusty | 14 -------------- 4 files changed, 63 deletions(-) delete mode 100644 tests/Dockerfile.debian-jessie delete mode 100644 tests/Dockerfile.fedora-24 delete mode 100644 tests/Dockerfile.ubuntu-trusty diff --git a/.travis.yml b/.travis.yml index 291a6b5..3ba4064 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,24 +18,15 @@ env: - distribution: fedora init: /usr/lib/systemd/systemd version: 25 - - distribution: fedora - init: /usr/lib/systemd/systemd - version: 24 - distribution: ubuntu init: /lib/systemd/systemd version: bionic - distribution: ubuntu init: /lib/systemd/systemd version: xenial - - distribution: ubuntu - init: /sbin/init - version: trusty - distribution: debian init: /lib/systemd/systemd version: stretch - - distribution: debian - init: /lib/systemd/systemd - version: jessie before_install: - 'sudo pip install yamllint' diff --git a/tests/Dockerfile.debian-jessie b/tests/Dockerfile.debian-jessie deleted file mode 100644 index 2bb5bc2..0000000 --- a/tests/Dockerfile.debian-jessie +++ /dev/null @@ -1,14 +0,0 @@ -FROM debian:jessie -ENV container=docker - -RUN apt-get update && \ - apt-get install -y --no-install-recommends build-essential libffi-dev \ - libssl-dev python-dev python-minimal python-pip python-setuptools \ - python-virtualenv && \ - rm -rf /var/lib/apt/lists/* - -RUN pip install --upgrade pip setuptools && \ - pip install enum34 ipaddress wheel && \ - pip install ansible ansible-lint - -COPY .ansible-lint / diff --git a/tests/Dockerfile.fedora-24 b/tests/Dockerfile.fedora-24 deleted file mode 100644 index b2a83cc..0000000 --- a/tests/Dockerfile.fedora-24 +++ /dev/null @@ -1,26 +0,0 @@ -FROM fedora:24 -ENV container=docker - -RUN dnf -y install gmp-devel libffi-devel openssl-devel python-crypto \ - python-devel python-dnf python-pip python-setuptools python-virtualenv \ - redhat-rpm-config systemd && \ - dnf -y group install "C Development Tools and Libraries" - -# Install systemd -- See https://hub.docker.com/_/centos/ -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 /etc/systemd/system/*.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/basic.target.wants/*;\ - rm -f /lib/systemd/system/anaconda.target.wants/*; - -RUN pip install enum34 ipaddress wheel && \ - pip install ansible ansible-lint - -COPY .ansible-lint / - -VOLUME ["/sys/fs/cgroup"] - -CMD ["/usr/sbin/init"] diff --git a/tests/Dockerfile.ubuntu-trusty b/tests/Dockerfile.ubuntu-trusty deleted file mode 100644 index b1645da..0000000 --- a/tests/Dockerfile.ubuntu-trusty +++ /dev/null @@ -1,14 +0,0 @@ -FROM ubuntu:trusty -ENV container=docker - -RUN apt-get update && \ - apt-get install -y --no-install-recommends build-essential libffi-dev \ - libssl-dev python-dev python-minimal python-pip python-setuptools \ - python-virtualenv && \ - rm -rf /var/lib/apt/lists/* - -RUN pip install --upgrade pip setuptools && \ - pip install enum34 ipaddress wheel && \ - pip install ansible ansible-lint - -COPY .ansible-lint /