Skip to content
Snippets Groups Projects
Commit 49b8d376 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

chore: remove eicd from container

parent 19257180
Branches
Tags
1 merge request!354chore: remove eicd from container
...@@ -3,9 +3,8 @@ image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest ...@@ -3,9 +3,8 @@ image: eicweb.phy.anl.gov:4567/containers/image_recipes/ubuntu_dind:latest
variables: variables:
## Application versions used for the main release ## Application versions used for the main release
## note: nightly builds will always use the master/main branch ## 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" NPDET_VERSION: "v1.3.2"
EICD_VERSION: "v2.0.0"
AFTERBURNER_VERSION: "v0.1.2" AFTERBURNER_VERSION: "v0.1.2"
## Spack github version, e.g. v0.18.1 or commit hash ## Spack github version, e.g. v0.18.1 or commit hash
...@@ -279,7 +278,6 @@ oneapi_jug_xl:default: ...@@ -279,7 +278,6 @@ oneapi_jug_xl:default:
--build-arg INTERNAL_TAG=${INTERNAL_TAG} --build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION} --build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
--build-arg NPDET_VERSION=${NPDET_VERSION} --build-arg NPDET_VERSION=${NPDET_VERSION}
--build-arg EICD_VERSION=${EICD_VERSION}
--build-arg AFTERBURNER_VERSION=${AFTERBURNER_VERSION} --build-arg AFTERBURNER_VERSION=${AFTERBURNER_VERSION}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
containers/oneapi containers/oneapi
...@@ -404,7 +402,6 @@ jug_xl:default: ...@@ -404,7 +402,6 @@ jug_xl:default:
--build-arg INTERNAL_TAG=${INTERNAL_TAG} --build-arg INTERNAL_TAG=${INTERNAL_TAG}
--build-arg JUGGLER_VERSION=${JUGGLER_VERSION} --build-arg JUGGLER_VERSION=${JUGGLER_VERSION}
--build-arg NPDET_VERSION=${NPDET_VERSION} --build-arg NPDET_VERSION=${NPDET_VERSION}
--build-arg EICD_VERSION=${EICD_VERSION}
--build-arg AFTERBURNER_VERSION=${AFTERBURNER_VERSION} --build-arg AFTERBURNER_VERSION=${AFTERBURNER_VERSION}
--build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD) --build-arg JUG_VERSION=${INTERNAL_TAG}-$(git rev-parse HEAD)
containers/jug containers/jug
...@@ -581,7 +578,6 @@ juggler:master: ...@@ -581,7 +578,6 @@ juggler:master:
variables: variables:
TRIGGERED_BY_NIGHTLY: 1 TRIGGERED_BY_NIGHTLY: 1
JUGGLER_VERSION: master JUGGLER_VERSION: master
EICD_VERSION: master
NPDET_VERSION: master NPDET_VERSION: master
DETECTOR_VERSION: master DETECTOR_VERSION: master
IP6_VERSION: master IP6_VERSION: master
......
...@@ -11,8 +11,6 @@ FROM ${DOCKER_REGISTRY}jug_dev:${INTERNAL_TAG} ...@@ -11,8 +11,6 @@ FROM ${DOCKER_REGISTRY}jug_dev:${INTERNAL_TAG}
ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects" ARG EICWEB="https://eicweb.phy.anl.gov/api/v4/projects"
ARG JUGGLER_VERSION="master" ARG JUGGLER_VERSION="master"
ARG NPDET_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 ## version will automatically bust cache for nightly, as it includes
## the date ## the date
...@@ -30,16 +28,7 @@ RUN cd /tmp ...@@ -30,16 +28,7 @@ RUN cd /tmp
&& pushd NPDet \ && pushd NPDet \
&& echo " - NPDet: ${NPDET_VERSION}-$(git rev-parse HEAD)">> /etc/jug_info \ && echo " - NPDet: ${NPDET_VERSION}-$(git rev-parse HEAD)">> /etc/jug_info \
&& popd \ && popd \
&& rm -rf build NPDet \ && 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
ADD ${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json ADD ${EICWEB}/369/repository/tree?ref=${JUGGLER_VERSION} /tmp/369.json
RUN cd /tmp \ RUN cd /tmp \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment