Commit 7ce4621f authored by Mihai Patrascoiu's avatar Mihai Patrascoiu
Browse files

Clean EOS repo files:

- Use repo files instead of printing the repository via echo command
- XRootD will be installed from the eos-depend repo
- The xrd_testing image will disable xrootd from eos-depend and install from the xrootd-testing repo
parent 63c9e5f4
......@@ -37,10 +37,9 @@ RUN yum -y --nogpg install \
ENV EOSREPODIR="/repo/eos"
ADD cc7_artifacts ${EOSREPODIR}
# Special packages, must be installed un-cached.
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-depend]\nname=EOS dependencies\nbaseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-7/x86_64/\ngpgcheck=0\nenabled=1\npriority=1\n' >> /etc/yum.repos.d/eos-depend.repo; \
# Special packages, must be installed un-cached.
yum -y --nogpg install quarkdb grid-hammer davix; \
yum -y --nogpg install \
eos-server eos-testkeytab eos-archive eos-client \
......
......@@ -37,13 +37,11 @@ RUN yum -y --nogpg install \
ENV EOSREPODIR="/repo/eos"
ADD cc7_asan_artifacts ${EOSREPODIR}
# Special packages, must be installed un-cached.
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-depend]\nname=EOS dependencies\nbaseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-7/x86_64/\ngpgcheck=0\nenabled=1\nexclude=xrootd*\npriority=4\n' >> /etc/yum.repos.d/eos-depend.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 install --nogpg --disablerepo="cern*" -y eos-client eos-server eos-test quarkdb
# Generate a new forwardable keytab 'eos-test+' to replace the not-forwardable one (installed by the eos-testkeytab package).
# This is useful to deploy EOS on Kubernetes clusters running on CERN's Cloud Infrastructure; you can remove these lines if you don't need one.
RUN yes | xrdsssadmin -k eos-test del /etc/eos.keytab; \
......
......@@ -33,7 +33,7 @@ RUN yum -y --nogpg install \
# Special packages, must be installed un-cached.
RUN yum clean all; \
yum -y --nogpg --enablerepo=xrootd-testing install \
yum -y --nogpg --enablerepo=xrootd-testing --setopt="eos-depend.exclude=xrootd*" install \
quarkdb grid-hammer davix
# Install new EOS from created repo - the ADD command will reset the docker cache,
......@@ -43,7 +43,7 @@ ADD cc7_artifacts_xrd_testing ${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; \
yum -y --nogpg --enablerepo=xrootd-testing install \
yum -y --nogpg --enablerepo=xrootd-testing --setopt="eos-depend.exclude=xrootd*" install \
eos-server eos-testkeytab eos-archive eos-client \
eos-debuginfo eos-fuse eos-fusex eos-test
......
[eos]
name=EOS 4 Version
baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine/tag/el-7/x86_64/
gpgcheck=0
enabled=1
npriority=4
[eos-depend]
name=EOS 4 Dependencies
baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-7/x86_64/
gpgcheck=0
enabled=1
npriority=4
[eos]
name=EOS 4 Version
name=EOS Citrine - Commit Version
baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine/commit/el-7/x86_64/
gpgcheck=0
enabled=1
priority=2
[eos-tag]
name=EOS Citrine - Tag Version
baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine/tag/el-7/x86_64/
gpgcheck=0
enabled=1
priority=4
[eos-depend]
name=EOS 4 Dependencies
name=EOS Citrine Dependencies
baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-7/x86_64/
gpgcheck=0
enabled=1
......
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