CI: Adapt FTS and DMC repository files to the new filenames:

- fts3-el7 / dmc-el7: production repository
- fts3-rc-el7 / dmc-rc-el7: release candidates repository
- fts3-devel-el7 / dmc-devel-el7: continuously built from the development branch

Author: mpatrascoiu

.gitlab-ci.yml

@@ -45,7 +45,7 @@ cc7:
       else CACHE="false"; REGISTRY="${CI_COMMIT_TAG}";
       fi
     - if [[ -z "$DMC_REPO" ]];
-      then DMC_REPO="https://dmc-repo.web.cern.ch/dmc-repo/dmc-ci-el7.repo";
+      then DMC_REPO="https://dmc-repo.web.cern.ch/dmc-repo/dmc-devel-el7.repo";
       fi
     - DESTINATION="gitlab-registry.cern.ch/fts/fts3:${REGISTRY}"
     - printf "CACHE=${CACHE}\nDESTINATION=${DESTINATION}\nDMCREPO=${DMC_REPO}\n"

ci/docker/Dockerfile-ci

@@ -21,7 +21,7 @@ RUN createrepo /repo/fts
 RUN echo -e "[fts-ci]\nname=FTS CI\nbaseurl=file:///repo/fts\ngpgcheck=0\nenabled=1\npriority=2" > /etc/yum.repos.d/fts.repo
 
 # Add DMC repo
-ARG dmcrepo=https://dmc-repo.web.cern.ch/dmc-repo/dmc-ci-el7.repo
+ARG dmcrepo=https://dmc-repo.web.cern.ch/dmc-repo/dmc-devel-el7.repo
 ADD $dmcrepo /etc/yum.repos.d/dmc.repo
 RUN yum clean metadata
 

packaging/docker/Dockerfile

@@ -13,11 +13,11 @@ RUN yum localinstall /tmp/epel-release-7.noarch.rpm -y \
         && rm -rf /var/cache/yum
 
 # Add FTS repo
-ARG ftsrepo=https://fts-repo.web.cern.ch/fts-repo/fts3-continuous-el7.repo
+ARG ftsrepo=https://fts-repo.web.cern.ch/fts-repo/fts3-devel-el7.repo
 ADD $ftsrepo /etc/yum.repos.d/fts.repo
 
 # Add DMC repo
-ARG dmcrepo=https://dmc-repo.web.cern.ch/dmc-repo/dmc-ci-el7.repo
+ARG dmcrepo=https://dmc-repo.web.cern.ch/dmc-repo/dmc-devel-el7.repo
 ADD $dmcrepo /etc/yum.repos.d/dmc.repo
 RUN yum clean all
 

packaging/docker/docker-build.sh

@@ -1 +1 @@
-docker build --build-arg ftsrepo=https://fts-repo.web.cern.ch/fts-repo/fts3-continuous-el7.repo --build-arg dmcrepo=https://dmc-repo.web.cern.ch/dmc-repo/dmc-ci-el7.repo .
+docker build --build-arg ftsrepo=https://fts-repo.web.cern.ch/fts-repo/fts3-devel-el7.repo --build-arg dmcrepo=https://dmc-repo.web.cern.ch/dmc-repo/dmc-devel-el7.repo .

qa/Dockerfile

@@ -17,9 +17,9 @@
 FROM centos:7
 
 # Required repos
-ADD "http://dmc-repo.web.cern.ch/dmc-repo/dmc-ci-el7.repo" "/etc/yum.repos.d/"
-ADD "http://dmc-repo.web.cern.ch/dmc-repo/dmc-externals-el7.repo" "/etc/yum.repos.d/"
-ADD "http://fts-repo.web.cern.ch/fts-repo/fts3-continuous-el7.repo" "/etc/yum.repos.d/"
+#ADD "http://dmc-repo.web.cern.ch/dmc-repo/dmc-externals-el7.repo" "/etc/yum.repos.d/"
+ADD "https://fts-repo.web.cern.ch/fts-repo/fts3-devel-el7.repo" "/etc/yum.repos.d/"
+ADD "https://dmc-repo.web.cern.ch/dmc-repo/dmc-devel-el7.repo" "/etc/yum.repos.d/"
 ADD "http://repository.egi.eu/sw/production/cas/1/current/repo-files/EGI-trustanchors.repo" "/etc/yum.repos.d/"
 
 RUN yum install -y epel-release yum-utils