diff --git a/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms/Dockerfile b/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms/Dockerfile index 164cb21a87d4941f0bc4f26c6881e5e48ca462ab..77ab998a890a08ff879945365e578c4ac90198d0 100644 --- a/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms/Dockerfile +++ b/continuousintegration/docker/ctafrontend/cc7/buildtree-stage1-rpms/Dockerfile @@ -47,14 +47,15 @@ RUN yum install -y \ # => need to set epel prio to 4: yum-config-manager --setopt="epel.priority=4" # or if taking the older version from eos, eos-citrine-depend must be enabled so that # the older version of xroot is installed by cta-cli and is not conflicting later when installing eos... -# Newer version of CTA requires xroot >= 4.4.1-1... -# therefore set epel priority to 4... -# Create local repo for cta artifacts and to cache RPMs locally +# The newest version of CTA with SSI requires xroot >= 20170801 +# therefore delete epel priority and use our local repo + +# Create local repo for cta artifacts and to cache RPMs locally # Populate local repository and enable it, then install any rpm that is needed for # any container. Finally add needed directories. -RUN yum-config-manager --enable epel --setopt="epel.priority=4" \ +RUN yum-config-manager --enable epel \ && \ yum-config-manager --enable castor \ && \ diff --git a/continuousintegration/docker/ctafrontend/cc7/ci_runner/Dockerfile b/continuousintegration/docker/ctafrontend/cc7/ci_runner/Dockerfile index 5d9892472cde4c164e39ed893b35e1e3ebd59f2b..8ad163147fb8a944064a496854f990c0272e62ee 100644 --- a/continuousintegration/docker/ctafrontend/cc7/ci_runner/Dockerfile +++ b/continuousintegration/docker/ctafrontend/cc7/ci_runner/Dockerfile @@ -43,8 +43,10 @@ RUN yum install -y \ # => need to set epel prio to 4: yum-config-manager --setopt="epel.priority=4" # or if taking the older version from eos, eos-citrine-depend must be enabled so that # the older version of xroot is installed by cta-cli and is not conflicting later when installing eos... - # Newer version of CTA requires xroot >= 4.4.1-1... - # therefore set epel priority to 4... + # + # The newest version of CTA with SSI requires xroot >= 20170801 + # therefore delete epel priority and use our local repo + # Create local repo for cta artifacts and to cache RPMs locally mkdir -p ${CTAREPODIR}/RPMS/x86_64 ${LOCALORCHESTRATIONDIR} @@ -52,7 +54,7 @@ RUN yum install -y \ ADD build_rpm/RPM ${CTAREPODIR} # Populate local repository and enable it -RUN yum-config-manager --enable epel --setopt="epel.priority=4" \ +RUN yum-config-manager --enable epel \ && \ yum install --downloadonly --downloaddir=${CTAREPODIR}/RPMS/x86_64 \ eos-client \