Made the installation of rpms conditional to the CI environment.

The installation in the buildtree environment is not useful as all is pre-installed in the image.

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

@@ -93,6 +93,9 @@ RUN yum-config-manager --enable epel --setopt="epel.priority=4" \
   && \
     mkdir -pv /etc/cta
 
+# Mark the image as a buildtree image
+RUN touch /etc/buildtreeRunner
+
 # Docker image run setup
 ADD ${BASEDIR}/run.sh /
 

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/client.sh

@@ -2,11 +2,13 @@
 
 . /opt/run/bin/init_pod.sh
 
-yum-config-manager --enable cta-artifacts
-yum-config-manager --enable ceph
+if [ ! -e /etc/buildtreeRunner ]; then
+  yum-config-manager --enable cta-artifacts
+  yum-config-manager --enable ceph
 
-# Install missing RPMs
-yum -y install cta-cli cta-debuginfo xrootd-client eos-client
+  # Install missing RPMs
+  yum -y install cta-cli cta-debuginfo xrootd-client eos-client
+fi
 
 cat <<EOF > /etc/cta/cta-cli.conf
 # The CTA frontend address in the form <FQDN>:<TCPPort>

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctacli.sh

@@ -2,11 +2,13 @@
 
 . /opt/run/bin/init_pod.sh
 
-yum-config-manager --enable cta-artifacts
-yum-config-manager --enable ceph
+if [ ! -e /etc/buildtreeRunner ]; then
+  yum-config-manager --enable cta-artifacts
+  yum-config-manager --enable ceph
 
-# Install missing RPMs
-yum -y install cta-cli cta-debuginfo
+  # Install missing RPMs
+  yum -y install cta-cli cta-debuginfo
+fi
 
 cat <<EOF > /etc/cta/cta-cli.conf
 # The CTA frontend address in the form <FQDN>:<TCPPort>

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh

@@ -2,13 +2,15 @@
 
 . /opt/run/bin/init_pod.sh
 
-yum-config-manager --enable cta-artifacts
-yum-config-manager --enable eos-citrine-commit
-yum-config-manager --enable eos-citrine-depend
-yum-config-manager --enable eos-citrine
-
-# Install missing RPMs
-yum -y install eos-client eos-server xrootd-client xrootd-debuginfo xrootd-server cta-cli cta-debuginfo sudo
+if [ ! -e /etc/buildtreeRunner ]; then
+  yum-config-manager --enable cta-artifacts
+  yum-config-manager --enable eos-citrine-commit
+  yum-config-manager --enable eos-citrine-depend
+  yum-config-manager --enable eos-citrine
+
+  # Install missing RPMs
+  yum -y install eos-client eos-server xrootd-client xrootd-debuginfo xrootd-server cta-cli cta-debuginfo sudo
+fi
 
 # create local users as the mgm is the only one doing the uid/user/group mapping in the full infrastructure
 groupadd --gid 1100 eosusers

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctafrontend.sh

@@ -2,12 +2,14 @@
 
 . /opt/run/bin/init_pod.sh
 
+if [ ! -e /etc/buildtreeRunner ]; then
 yum-config-manager --enable cta-artifacts
 yum-config-manager --enable ceph
 
 # Install missing RPMs
 # cta-catalogueutils is needed to delete the db at the end of instance
 yum -y install cta-frontend cta-debuginfo cta-catalogueutils ceph-common
+fi
 
 yes | cp -r /opt/ci/ctafrontend/etc / 
 

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/init.sh

@@ -5,13 +5,15 @@
 # oracle sqlplus client binary path
 ORACLE_SQLPLUS="/usr/bin/sqlplus64"
 
-# enable cta repository from previously built artifacts
-yum-config-manager --enable cta-artifacts
-yum-config-manager --enable ceph
-
-# install needed packages
-yum -y install cta-objectstore-tools cta-doc mt-st mtx lsscsi sg3_utils cta-catalogueutils ceph-common oracle-instantclient-sqlplus
-yum clean packages
+if [ ! -e /etc/buildtreeRunner ]; then
+  # enable cta repository from previously built artifacts
+  yum-config-manager --enable cta-artifacts
+  yum-config-manager --enable ceph
+
+  # install needed packages
+  yum -y install cta-objectstore-tools cta-doc mt-st mtx lsscsi sg3_utils cta-catalogueutils ceph-common oracle-instantclient-sqlplus
+  yum clean packages
+fi
 
 echo "Using this configuration for library:"
 /opt/run/bin/init_library.sh

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/kdc.sh

@@ -3,7 +3,9 @@
 . /opt/run/bin/init_pod.sh
 
 # Install missing RPMs (kdc)
-yum -y install heimdal-server heimdal-workstation
+if [ ! -e /etc/buildtreeRunner ]; then
+  yum -y install heimdal-server heimdal-workstation
+fi
 
 # Init the kdc store
 echo -n "Initing kdc... "

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/rmcd.sh

@@ -2,12 +2,14 @@
 
 . /opt/run/bin/init_pod.sh
 
-yum-config-manager --enable cta-artifacts
-yum-config-manager --enable ceph
-yum-config-manager --enable castor
+if [ ! -e /etc/buildtreeRunner ]; then
+  yum-config-manager --enable cta-artifacts
+  yum-config-manager --enable ceph
+  yum-config-manager --enable castor
 
-# Install missing RPMs
-yum -y install mt-st mtx lsscsi sg3_utils cta-taped cta-debuginfo castor-rmc-server
+  # Install missing RPMs
+  yum -y install mt-st mtx lsscsi sg3_utils cta-taped cta-debuginfo castor-rmc-server
+fi
 
 # source library configuration file
 echo "Using this configuration for library:"

continuousintegration/docker/ctafrontend/cc7/opt/run/bin/taped.sh

@@ -2,12 +2,14 @@
 
 . /opt/run/bin/init_pod.sh
 
-yum-config-manager --enable cta-artifacts
-yum-config-manager --enable ceph
-yum-config-manager --enable castor
-
-# Install missing RPMs
-yum -y install mt-st mtx lsscsi sg3_utils cta-taped cta-debuginfo castor-rmc-server ceph-common
+if [ ! -e /etc/buildtreeRunner ]; then
+  yum-config-manager --enable cta-artifacts
+  yum-config-manager --enable ceph
+  yum-config-manager --enable castor
+
+  # Install missing RPMs
+  yum -y install mt-st mtx lsscsi sg3_utils cta-taped cta-debuginfo castor-rmc-server ceph-common
+fi
 
 echo "Using this configuration for library:"
 /opt/run/bin/init_library.sh