CI: Make the path to the dependency repository configurable depending on the...

CI: Make the path to the dependency repository configurable depending on the eos version being built

Dockerfile

@@ -6,6 +6,8 @@
 FROM centos:7
 LABEL maintainer="Elvin Sindrilaru, esindril@cern.ch, CERN 2017"
 
+ARG EOS_CODENAME
+
 # Add extra repositories
 COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
 
@@ -24,8 +26,11 @@ COPY eos-docker/fstfmd.dict /var/eos/md/
 COPY eos-docker/xrootd.conf /etc/tmpfiles.d/
 COPY eos-docker/xrootd-fwd-proxy.cfg /etc/xrootd/
 
-RUN mkdir /var/tmp/eosxd-cache/ /var/tmp/eosxd-journal/
+# Set correct path for the dependency repository based on the EOS version
+# which is being built
+RUN sed -i 's/__EOS_CODENAME__/${EOS_CODENAME}/g' /etc/yum.repos.d/eos.repo
 
+RUN mkdir /var/tmp/eosxd-cache/ /var/tmp/eosxd-journal/
 RUN adduser eos-user
 
 # Docker will aggressively cache the following command, but this is fine, since

Dockerfile_asan

@@ -6,6 +6,8 @@
 FROM centos:7
 LABEL maintainer="Fabio Luchetti faluchet@cern.ch, CERN 2019"
 
+ARG EOS_CODENAME
+
 # Add extra repositories
 COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
 
@@ -24,6 +26,10 @@ COPY eos-docker/fstfmd.dict /var/eos/md/
 COPY eos-docker/xrootd.conf /etc/tmpfiles.d/
 COPY eos-docker/xrootd-fwd-proxy.cfg /etc/xrootd/
 
+# Set correct path for the dependency repository based on the EOS version
+# which is being built
+RUN sed -i 's/__EOS_CODENAME__/${EOS_CODENAME}/g' /etc/yum.repos.d/eos.repo
+
 RUN mkdir /var/tmp/eosxd-cache/ /var/tmp/eosxd-journal/
 
 RUN adduser eos-user

Dockerfile_c8

@@ -6,6 +6,8 @@
 FROM centos:8
 LABEL maintainer="Mihai Patrascoiu, mihai.patrascoiu@cern.ch, CERN 2020"
 
+ARG EOS_CODENAME
+
 # Add extra repositories
 COPY eos-docker/el-8/*.repo /etc/yum.repos.d/
 
@@ -24,6 +26,10 @@ COPY eos-docker/fstfmd.dict /var/eos/md/
 COPY eos-docker/xrootd.conf /etc/tmpfiles.d/
 COPY eos-docker/xrootd-fwd-proxy.cfg /etc/xrootd/
 
+# Set correct path for the dependency repository based on the EOS version
+# which is being built
+RUN sed -i 's/__EOS_CODENAME__/${EOS_CODENAME}/g' /etc/yum.repos.d/eos.repo
+
 RUN mkdir /var/tmp/eosxd-cache/ /var/tmp/eosxd-journal/
 
 RUN adduser eos-user

Dockerfile_no_sse

@@ -6,6 +6,8 @@
 FROM centos:7
 LABEL maintainer="Elvin Sindrilaru, esindril@cern.ch, CERN 2017"
 
+ARG EOS_CODENAME
+
 # Add extra repositories
 COPY eos-docker/el-7/*.repo /etc/yum.repos.d/
 
@@ -24,6 +26,10 @@ COPY eos-docker/fstfmd.dict /var/eos/md/
 COPY eos-docker/xrootd.conf /etc/tmpfiles.d/
 COPY eos-docker/xrootd-fwd-proxy.cfg /etc/xrootd/
 
+# Set correct path for the dependency repository based on the EOS version
+# which is being built
+RUN sed -i 's/__EOS_CODENAME__/${EOS_CODENAME}/g' /etc/yum.repos.d/eos.repo
+
 RUN mkdir /var/tmp/eosxd-cache/ /var/tmp/eosxd-journal/
 
 RUN adduser eos-user

el-7/eos.repo

 [eos]
 name=EOS Citrine - Commit Version
-baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine/commit/el-7/x86_64/
+baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/__EOS_CODENAME__/commit/el-7/x86_64/
 gpgcheck=0
 enabled=0
 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/
+baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/__EOS_CODENAME__/tag/el-7/x86_64/
 gpgcheck=0
 enabled=0
 priority=4
 
 [eos-depend]
 name=EOS Citrine Dependencies
-baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/citrine-depend/el-7/x86_64/
+baseurl=http://storage-ci.web.cern.ch/storage-ci/eos/__EOS_CODENAME__-depend/el-7/x86_64/
 gpgcheck=0
 enabled=1
 priority=2