tests/docker: remove ubuntu 16.04 build, EOL

diff --git a/tests/docker-ubuntu-1604/Dockerfile b/tests/docker-ubuntu-1604/Dockerfile
deleted file mode 100644 (file)
index 5d14595..0000000
--- a/tests/docker-ubuntu-1604/Dockerfile
+++ /dev/null
@@ -1,34 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-RUN apt-get install -y \
-           python-yaml \
-           python3-yaml \
-           python-pytest \
-           python3-pytest \
-           python-pip \
-           python3-pip
-
-# RUN yum -y install epel-release
-# RUN yum -y install \
-#     git \
-#     python-yaml \
-#     python-pip \
-#     pytest \
-#     python34-yaml \
-#     python34-pytest \
-#     python34-pip \
-#     findutils
-
-COPY / /src
-RUN find /src -name \*.pyc -delete
-
-ENV PYTEST2 py.test
-ENV PYTEST3 py.test-3
-
-ENV PIP2 pip2
-ENV PIP3 pip3
-
-WORKDIR /src
-
-CMD ["./tests/docker-ubuntu-1604/run.sh"]

diff --git a/tests/docker-ubuntu-1604/Makefile b/tests/docker-ubuntu-1604/Makefile
deleted file mode 100644 (file)
index 85f8dee..0000000
--- a/tests/docker-ubuntu-1604/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-TAG := suricata-update/tests/ubuntu-1604
-
-all:
-       docker build -t $(TAG) -f Dockerfile ../..
-       docker run --rm -it $(TAG)

diff --git a/tests/docker-ubuntu-1604/README.md b/tests/docker-ubuntu-1604/README.md
deleted file mode 100644 (file)
index c7f12b2..0000000
--- a/tests/docker-ubuntu-1604/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-This is a live test of Suricata-Update in an Ubuntu 16.04 LTS Docker
-image.
-
-The following tests are performed:
-- Unit tests with Python 2 and Python 3.
-- Installation with Python 2 pip.
-- Various commands run as a user might with Python 2 install.
-- Installation with Python 3 pip.
-- Various commands run as a user might with Python 3 install.
-
-This test is "live" as the index and rule files will be downloaded
-from the internet.

diff --git a/tests/docker-ubuntu-1604/run.sh b/tests/docker-ubuntu-1604/run.sh
deleted file mode 100755 (executable)
index 533aed0..0000000
--- a/tests/docker-ubuntu-1604/run.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/sh
-
-set -e
-set -x
-
-# Test the commands in a scenario a user might.
-test_commands() {
-    # Cleanup.
-    rm -rf /var/lib/suricata
-
-    suricata-update
-    test -e /var/lib/suricata/rules/suricata.rules
-
-    suricata-update update-sources
-    test -e /var/lib/suricata/update/cache/index.yaml
-
-    suricata-update enable-source oisf/trafficid
-    test -e /var/lib/suricata/update/sources/et-open.yaml
-    test -e /var/lib/suricata/update/sources/oisf-trafficid.yaml
-    suricata-update
-
-    suricata-update disable-source oisf/trafficid
-    test ! -e /var/lib/suricata/update/sources/oisf-trafficid.yaml
-    test -e /var/lib/suricata/update/sources/oisf-trafficid.yaml.disabled
-
-    suricata-update remove-source oisf/trafficid
-    test ! -e /var/lib/suricata/update/sources/oisf-trafficid.yaml.disabled
-}
-
-# Python 2 unit tests.
-PYTHONPATH=. ${PYTEST2}
-
-# Python 3 unit tests.
-PYTHONPATH=. ${PYTEST3}
-
-# Install with Python 2.
-${PIP2} install .
-test -e /usr/local/bin/suricata-update
-
-test_commands
-
-# Uninstall Python 2 version.
-${PIP2} uninstall --yes suricata-update
-test ! -e /usr/local/bin/suricata-update
-
-# Install and run with Python 3.
-${PIP3} install .
-test -e /usr/local/bin/suricata-update
-grep python3 -s /usr/local/bin/suricata-update
-
-test_commands
-
-${PIP3} uninstall --yes suricata-update
-test ! -e /usr/local/bin/suricata-update