Commit bd214248 authored by Elvin Sindrilaru's avatar Elvin Sindrilaru
Browse files

DOCKER: Adjust images built for EOS5 since quarkdb is built-in and also install

grid-hammer only on demand in the relevant tests.
parent ccb82f6f
Pipeline #2416712 skipped with stage
...@@ -63,11 +63,12 @@ ADD cc7_artifacts ${EOSREPODIR} ...@@ -63,11 +63,12 @@ ADD cc7_artifacts ${EOSREPODIR}
RUN createrepo ${EOSREPODIR} \ RUN createrepo ${EOSREPODIR} \
&& echo -e "[eos-artifacts]\nname=EOS artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos.repo \ && echo -e "[eos-artifacts]\nname=EOS artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos.repo \
&& yum -y --nogpg install \ && yum -y --nogpg install \
davix grid-hammer quarkdb \ davix eos-archive eos-client eos-fuse eos-fusex eos-ns-inspect \
eos-archive eos-client eos-fuse eos-fusex eos-ns-inspect eos-server eos-test eos-testkeytab \ eos-server eos-test eos-testkeytab eos-folly-2019.11.11.00 eos-folly-deps-2019.11.11.00 \
eos-folly-2019.11.11.00 eos-folly-deps-2019.11.11.00 \
&& yum clean all && yum clean all
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; fi
# ************* # *************
# NOTE: !UGLY!* # NOTE: !UGLY!*
# ************* # *************
......
...@@ -64,11 +64,12 @@ ADD cc7_asan_artifacts ${EOSREPODIR} ...@@ -64,11 +64,12 @@ ADD cc7_asan_artifacts ${EOSREPODIR}
RUN createrepo ${EOSREPODIR} \ RUN createrepo ${EOSREPODIR} \
&& echo -e "[eos-asan-artifacts]\nname=EOS Asan artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos-artifacts.repo \ && echo -e "[eos-asan-artifacts]\nname=EOS Asan artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos-artifacts.repo \
&& yum -y --nogpg --disablerepo="cern*" install \ && yum -y --nogpg --disablerepo="cern*" install \
quarkdb \
eos-client eos-ns-inspect eos-server eos-test eos-testkeytab \ eos-client eos-ns-inspect eos-server eos-test eos-testkeytab \
eos-folly-2019.11.11.00 eos-folly-deps-2019.11.11.00 \ eos-folly-2019.11.11.00 eos-folly-deps-2019.11.11.00 \
&& yum clean all && yum clean all
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; fi
# Generate a new forwardable keytab 'eos-test+' to replace the not-forwardable # Generate a new forwardable keytab 'eos-test+' to replace the not-forwardable
# one (installed by the eos-testkeytab package). # one (installed by the eos-testkeytab package).
# This is useful to deploy EOS on Kubernetes clusters running on CERN's Cloud # This is useful to deploy EOS on Kubernetes clusters running on CERN's Cloud
......
...@@ -71,12 +71,13 @@ ADD c8_artifacts ${EOSREPODIR} ...@@ -71,12 +71,13 @@ ADD c8_artifacts ${EOSREPODIR}
# Special packages, must be installed un-cached # Special packages, must be installed un-cached
RUN createrepo ${EOSREPODIR}; \ RUN createrepo ${EOSREPODIR}; \
echo -e "[eos-artifacts]\nname=EOS artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos.repo; \ echo -e "[eos-artifacts]\nname=EOS artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos.repo; \
dnf -y --nogpg install quarkdb davix; \ dnf -y --nogpg install davix \
dnf -y --nogpg install \ dnf -y --nogpg install eos-server eos-testkeytab eos-client eos-ns-inspect \
eos-server eos-testkeytab eos-client eos-ns-inspect \
eos-fuse eos-fusex eos-test \ eos-fuse eos-fusex eos-test \
&& dnf clean all && dnf clean all
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then dnf -y --nogpg install quarkdb; fi
# ************* # *************
# NOTE: !UGLY!* # NOTE: !UGLY!*
# ************* # *************
......
...@@ -67,11 +67,12 @@ ADD cc7_no_sse_artifacts ${EOSREPODIR} ...@@ -67,11 +67,12 @@ ADD cc7_no_sse_artifacts ${EOSREPODIR}
# Special packages, must be installed un-cached. # Special packages, must be installed un-cached.
RUN createrepo ${EOSREPODIR} \ RUN createrepo ${EOSREPODIR} \
&& echo -e "[eos-artifacts]\nname=EOS artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos.repo \ && echo -e "[eos-artifacts]\nname=EOS artifacts\nbaseurl=file://${EOSREPODIR}\ngpgcheck=0\nenabled=1\npriority=1" >> /etc/yum.repos.d/eos.repo \
&& yum -y --nogpg install \ && yum -y --nogpg install davix \
davix grid-hammer quarkdb \
eos-archive eos-client eos-fuse eos-fusex eos-ns-inspect eos-server eos-test eos-testkeytab \ eos-archive eos-client eos-fuse eos-fusex eos-ns-inspect eos-server eos-test eos-testkeytab \
&& yum clean all && yum clean all
RUN if [ "${EOS_CODENAME}" != "diopside" ]; then yum -y --nogpg install quarkdb; fi
# ************* # *************
# NOTE: !UGLY!* # NOTE: !UGLY!*
# ************* # *************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment