Split the buildtree image creation further into three steps.

The steps are now base RPMs, EOS and then scripts. This allows faster testing
of new EOS versions.

continuousintegration/buildtree_runner/prepareImage.sh

@@ -2,4 +2,5 @@
 
 echo Creating the docker image...
 ./prepareImageStage1-rpms.sh
-./prepareImageStage2-scripts.sh
+./prepareImageStage2-eos.sh
+./prepareImageStage3-scripts.sh
\ No newline at end of file

continuousintegration/buildtree_runner/prepareImageStage2-eos.sh

+#!/bin/bash -e
+
+(cd ~/CTA; sudo docker build . -f continuousintegration/docker/ctafrontend/cc7/buildtree-stage2-eos/Dockerfile -t buildtree-runner-stage2)

continuousintegration/buildtree_runner/prepareImageStage2-scripts.sh → continuousintegration/buildtree_runner/prepareImageStage3-scripts.sh

 #!/bin/bash -e
 
-(cd ~/CTA; sudo docker build . -f continuousintegration/docker/ctafrontend/cc7/buildtree-stage2-scripts/Dockerfile -t buildtree-runner)
+(cd ~/CTA; sudo docker build . -f continuousintegration/docker/ctafrontend/cc7/buildtree-stage3-scripts/Dockerfile -t buildtree-runner)

continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms/Dockerfile

@@ -59,8 +59,6 @@ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \
     yum-config-manager --enable castor \
   && \
     yum install -y\
-      eos-client \
-      eos-server \
       xrootd \
       xrootd-client \
       xrootd-debuginfo \

continuousintegration/docker/ctafrontend/cc7/buildtree-stage2-eos/Dockerfile

+# ******************************************************************************
+#
+# The CERN Tape Archive (CTA) project
+# Copyright (C) 2015  CERN
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# ****************************************************************************/
+
+# CTA generic image for system tests
+# FROM must be the first command in Dockerfile!!
+
+FROM buildtree-runner-stage1
+
+# my environment variables
+ENV ORCHESTRATIONDIR="continuousintegration/orchestration/pods" \
+    LOCALORCHESTRATIONDIR="/opt/ci" \
+    BASEDIR="continuousintegration/docker/ctafrontend/cc7" \
+    CTAREPODIR="/tmp/repo"
+
+# Update versionlock if needed
+ADD ${BASEDIR}/etc/yum/pluginconf.d /etc/yum/pluginconf.d
+
+# Install eos packages.
+RUN yum install -y\
+      eos-client \
+      eos-server \
+  && \
+    yum clean all \
+  && \
+    rm -rf /var/cache/yum
+
+# Docker image run setup
+ADD ${BASEDIR}/run.sh /
+
+ENTRYPOINT ["/run.sh"]
+

continuousintegration/docker/ctafrontend/cc7/buildtree-stage2-scripts/Dockerfile → continuousintegration/docker/ctafrontend/cc7/buildtree-stage3-scripts/Dockerfile

@@ -21,7 +21,7 @@
 # CTA generic image for system tests
 # FROM must be the first command in Dockerfile!!
 
-FROM buildtree-runner-stage1
+FROM buildtree-runner-stage2
 
 # my environment variables
 ENV ORCHESTRATIONDIR="continuousintegration/orchestration/pods" \