From 49b8d37699257f6385e2e7d53c1965e71955ae2f Mon Sep 17 00:00:00 2001
From: Wouter Deconinck <wdconinc@gmail.com>
Date: Tue, 20 Sep 2022 02:59:57 +0000
Subject: [PATCH] chore: remove eicd from container
---
.gitlab-ci.yml | 6 +-----
containers/jug/xl.Dockerfile | 13 +------------
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4bd6857a..59cc7ab07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,9 +3,8 @@ image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
variables:
## Application versions used for the main release
## note: nightly builds will always use the master/main branch
- JUGGLER_VERSION: "v7.0.0"
+ JUGGLER_VERSION: "v8.0.1"
NPDET_VERSION: "v1.3.2"
- EICD_VERSION: "v2.0.0"
AFTERBURNER_VERSION: "v0.1.2"
## Spack github version, e.g. v0.18.1 or commit hash
@@ -279,7 +278,6 @@ oneapi_jug_xl:default:
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
--build-arg NPDET_VERSION=${NPDET_VERSION}
- --build-arg EICD_VERSION=${EICD_VERSION}
--build-arg AFTERBURNER_VERSION=${AFTERBURNER_VERSION}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
containers/oneapi
@@ -404,7 +402,6 @@ jug_xl:default:
--build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
--build-arg NPDET_VERSION=${NPDET_VERSION}
- --build-arg EICD_VERSION=${EICD_VERSION}
--build-arg AFTERBURNER_VERSION=${AFTERBURNER_VERSION}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
containers/jug
@@ -581,7 +578,6 @@ juggler:master:
variables:
TRIGGERED_BY_NIGHTLY: 1
JUGGLER_VERSION: master
- EICD_VERSION: master
NPDET_VERSION: master
DETECTOR_VERSION: master
IP6_VERSION: master
diff --git a/containers/jug/xl.Dockerfile b/containers/jug/xl.Dockerfile
index dda45ac10..8df688ea2 100644
--- a/containers/jug/xl.Dockerfile
+++ b/containers/jug/xl.Dockerfile
@@ -11,8 +11,6 @@ FROM ${DOCKER_REGISTRY}jug_dev:${INTERNAL_TAG}
ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
ARG JUGGLER_VERSION="master"
ARG NPDET_VERSION="master"
-ARG EICD_REPOSITORYURL="https://github.com/eic/eicd.git"
-ARG EICD_VERSION="master"
## version will automatically bust cache for nightly, as it includes
## the date
@@ -30,16 +28,7 @@ RUN cd /tmp
&& pushd NPDet \
&& echo " - NPDet: ${NPDET_VERSION}-$(git rev-parse HEAD)">> /etc/jug_info \
&& popd \
- && rm -rf build NPDet \
- && cd /tmp \
- && echo "INSTALLING EICD" \
- && git clone -b ${EICD_VERSION} --depth 1 ${EICD_REPOSITORYURL} \
- && cmake -B build -S eicd -DCMAKE_CXX_STANDARD=17 \
- && cmake --build build -j12 -- install \
- && pushd eicd \
- && echo " - EICD: ${EICD_VERSION}-$(git rev-parse HEAD)">> /etc/jug_info \
- && popd \
- && rm -rf build eicd
+ && rm -rf build NPDet
ADD ${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json
RUN cd /tmp \
--
GitLab