From 966b5fd1a0398e403b2a96cab4000b734589a5fe Mon Sep 17 00:00:00 2001
From: Dag Wieers <dag@wieers.com>
Date: Wed, 7 Jun 2017 13:48:16 +0200
Subject: [PATCH] Add python-lxml to docker images (#25324)

---
 test/utils/docker/centos6/Dockerfile              | 1 +
 test/utils/docker/centos7/Dockerfile              | 1 +
 test/utils/docker/cloudstack-simulator/Dockerfile | 5 +++--
 test/utils/docker/fedora24/Dockerfile             | 1 +
 test/utils/docker/fedora25/Dockerfile             | 1 +
 test/utils/docker/opensuse42.1/Dockerfile         | 1 +
 test/utils/docker/opensuse42.2/Dockerfile         | 1 +
 test/utils/docker/ubuntu1204/Dockerfile           | 1 +
 test/utils/docker/ubuntu1404/Dockerfile           | 1 +
 test/utils/docker/ubuntu1604/Dockerfile           | 1 +
 test/utils/docker/ubuntu1604py3/Dockerfile        | 1 +
 11 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/utils/docker/centos6/Dockerfile b/test/utils/docker/centos6/Dockerfile
index 1927d9f7662..04f555675ba 100644
--- a/test/utils/docker/centos6/Dockerfile
+++ b/test/utils/docker/centos6/Dockerfile
@@ -21,6 +21,7 @@ RUN yum clean all && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-nose \
     python-paramiko \
diff --git a/test/utils/docker/centos7/Dockerfile b/test/utils/docker/centos7/Dockerfile
index 40e0ace99ff..b2d8a1dee35 100644
--- a/test/utils/docker/centos7/Dockerfile
+++ b/test/utils/docker/centos7/Dockerfile
@@ -29,6 +29,7 @@ RUN yum clean all && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-nose \
     python-paramiko \
diff --git a/test/utils/docker/cloudstack-simulator/Dockerfile b/test/utils/docker/cloudstack-simulator/Dockerfile
index fc137a2a37d..44bd4dc977c 100644
--- a/test/utils/docker/cloudstack-simulator/Dockerfile
+++ b/test/utils/docker/cloudstack-simulator/Dockerfile
@@ -15,9 +15,10 @@ RUN apt-get -y update && apt-get install -y \
     netcat \
     openjdk-8-jdk \
     python-dev \
-    python-setuptools \
-    python-pip \
+    python-lxml \
     python-mysql.connector \
+    python-pip \
+    python-setuptools \
     supervisor \
     wget \
     nginx \
diff --git a/test/utils/docker/fedora24/Dockerfile b/test/utils/docker/fedora24/Dockerfile
index 843a07b53d8..ddf94e7a7c9 100644
--- a/test/utils/docker/fedora24/Dockerfile
+++ b/test/utils/docker/fedora24/Dockerfile
@@ -36,6 +36,7 @@ RUN dnf clean all && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-nose \
     python-paramiko \
diff --git a/test/utils/docker/fedora25/Dockerfile b/test/utils/docker/fedora25/Dockerfile
index 62c63d8c5ad..92b0544385d 100644
--- a/test/utils/docker/fedora25/Dockerfile
+++ b/test/utils/docker/fedora25/Dockerfile
@@ -32,6 +32,7 @@ RUN dnf clean all && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-nose \
     python-paramiko \
diff --git a/test/utils/docker/opensuse42.1/Dockerfile b/test/utils/docker/opensuse42.1/Dockerfile
index 3f9e695e87b..cf12ed9f277 100644
--- a/test/utils/docker/opensuse42.1/Dockerfile
+++ b/test/utils/docker/opensuse42.1/Dockerfile
@@ -24,6 +24,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-MySQL-python \
     python-nose \
diff --git a/test/utils/docker/opensuse42.2/Dockerfile b/test/utils/docker/opensuse42.2/Dockerfile
index 6519b473d60..1d826ceaff5 100644
--- a/test/utils/docker/opensuse42.2/Dockerfile
+++ b/test/utils/docker/opensuse42.2/Dockerfile
@@ -24,6 +24,7 @@ RUN zypper --non-interactive --gpg-auto-import-keys refresh && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-MySQL-python \
     python-nose \
diff --git a/test/utils/docker/ubuntu1204/Dockerfile b/test/utils/docker/ubuntu1204/Dockerfile
index 36601a105a5..99efce49980 100644
--- a/test/utils/docker/ubuntu1204/Dockerfile
+++ b/test/utils/docker/ubuntu1204/Dockerfile
@@ -29,6 +29,7 @@ RUN apt-get update -y && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-mysqldb \
     python-nose \
diff --git a/test/utils/docker/ubuntu1404/Dockerfile b/test/utils/docker/ubuntu1404/Dockerfile
index 98f71060f10..4a61e44bf21 100644
--- a/test/utils/docker/ubuntu1404/Dockerfile
+++ b/test/utils/docker/ubuntu1404/Dockerfile
@@ -27,6 +27,7 @@ RUN apt-get update -y && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-mysqldb \
     python-nose \
diff --git a/test/utils/docker/ubuntu1604/Dockerfile b/test/utils/docker/ubuntu1604/Dockerfile
index bcfc80459f8..0e04c0e9ee4 100644
--- a/test/utils/docker/ubuntu1604/Dockerfile
+++ b/test/utils/docker/ubuntu1604/Dockerfile
@@ -30,6 +30,7 @@ RUN apt-get update -y && \
     python-httplib2 \
     python-jinja2 \
     python-keyczar \
+    python-lxml \
     python-mock \
     python-mysqldb \
     python-nose \
diff --git a/test/utils/docker/ubuntu1604py3/Dockerfile b/test/utils/docker/ubuntu1604py3/Dockerfile
index 42c75d0bebc..89ab6f9ac11 100644
--- a/test/utils/docker/ubuntu1604py3/Dockerfile
+++ b/test/utils/docker/ubuntu1604py3/Dockerfile
@@ -26,6 +26,7 @@ RUN apt-get update -y && \
     python3-dbus \
     python3-httplib2 \
     python3-jinja2 \
+    python3-lxml \
     python3-mock \
     python3-mysqldb \
     python3-nose \