[Fuego] [PATCH 1/2] dockerfile: split release test instructions

[Daniel Sangorrin]

Most users don't need to install the release test infrastructure

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 Dockerfile      | 51 ---------------------------------------------------
 Dockerfile.test | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 51 deletions(-)
 create mode 100644 Dockerfile.test

diff --git a/Dockerfile b/Dockerfile
index 2391166..bce2d8d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -67,57 +67,6 @@ RUN dpkg -i jenkins_${JENKINS_VERSION}_all.deb
 RUN rm jenkins_${JENKINS_VERSION}_all.deb
 RUN ls /var/lib/jenkins/plugins || true
 
-
-# ==============================================================================
-# Install Fuego Release Test Dependencies
-# ==============================================================================
-
-# TODO: This session should be moved to a separate Dockerfile in the future,
-# that simply extends a fuego-base image and compiles a Fuego that's capable of
-# testing itself.
-
-# Install Dependencies
-RUN apt-get update && \
-    apt-get -yV install \
-        apt-transport-https \
-        ca-certificates \
-        chromium \
-        curl \
-        gnupg2 \
-        imagemagick \
-        python3 \
-        python3-pip \
-        python3-pillow \
-        software-properties-common && \
-    rm -rf /var/lib/apt/lists/* && \
-    python3 -m pip install \
-        docker \
-        pexpect \
-        selenium
-
-# Install Docker
-RUN curl -fsSL https://download.docker.com/linux/$(source /etc/os-release; \
-        echo "$ID")/gpg | sudo apt-key add - && \
-    add-apt-repository \
-        "deb [arch=amd64] https://download.docker.com/linux/$(\
-            source /etc/os-release; echo "$ID") $(lsb_release -cs) stable" && \
-    apt-get update && \
-    apt-get -yV install \
-        docker-ce
-
-# Install Chrome Driver for SeleniumHQ
-RUN CHROME_DRIVER_VERSION=$(curl --silent --fail \
-        https://chromedriver.storage.googleapis.com/LATEST_RELEASE) && \
-    curl https://chromedriver.storage.googleapis.com/$(\
-        echo ${CHROME_DRIVER_VERSION})/chromedriver_linux64.zip \
-            -o chrome-driver.zip && \
-    unzip chrome-driver.zip -d /usr/local/bin && rm chrome-driver.zip && \
-    chmod +x /usr/local/bin/chromedriver
-
-# Setting jenkins as a sudoer. Needed for accessing the dockerd socket.
-RUN echo "jenkins ALL = (root) NOPASSWD:ALL" >> /etc/sudoers
-
-
 # ==============================================================================
 # get ttc script and helpers
 # ==============================================================================
diff --git a/Dockerfile.test b/Dockerfile.test
new file mode 100644
index 0000000..176d5af
--- /dev/null
+++ b/Dockerfile.test
@@ -0,0 +1,46 @@
+FROM fuego
+
+# ==============================================================================
+# Install Fuego Release Test Dependencies
+# ==============================================================================
+
+# Install Dependencies
+RUN apt-get update && \
+    apt-get -yV install \
+        apt-transport-https \
+        ca-certificates \
+        chromium \
+        curl \
+        gnupg2 \
+        imagemagick \
+        python3 \
+        python3-pip \
+        python3-pillow \
+        software-properties-common && \
+    rm -rf /var/lib/apt/lists/* && \
+    python3 -m pip install \
+        docker \
+        pexpect \
+        selenium
+
+# Install Docker
+RUN curl -fsSL https://download.docker.com/linux/$(source /etc/os-release; \
+        echo "$ID")/gpg | sudo apt-key add - && \
+    add-apt-repository \
+        "deb [arch=amd64] https://download.docker.com/linux/$(\
+            source /etc/os-release; echo "$ID") $(lsb_release -cs) stable" && \
+    apt-get update && \
+    apt-get -yV install \
+        docker-ce
+
+# Install Chrome Driver for SeleniumHQ
+RUN CHROME_DRIVER_VERSION=$(curl --silent --fail \
+        https://chromedriver.storage.googleapis.com/LATEST_RELEASE) && \
+    curl https://chromedriver.storage.googleapis.com/$(\
+        echo ${CHROME_DRIVER_VERSION})/chromedriver_linux64.zip \
+            -o chrome-driver.zip && \
+    unzip chrome-driver.zip -d /usr/local/bin && rm chrome-driver.zip && \
+    chmod +x /usr/local/bin/chromedriver
+
+# Setting jenkins as a sudoer. Needed for accessing the dockerd socket.
+RUN echo "jenkins ALL = (root) NOPASSWD:ALL" >> /etc/sudoers
-- 
2.7.4