diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4cb2ebc50f6e2f0746749c13025f90ee7408d29c..36142382d70896bc8e4d39dfabfd661b3dc53a04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -382,41 +382,6 @@ jug_xl:nightly: --build-context detectors=. containers/jug -jug_xl:feature: - extends: .build - stage: jug - rules: - - if: '$CI_COMMIT_BRANCH == "master"' - when: on_success - - when: never - needs: - - version - - jug_xl:nightly - variables: - BUILD_IMAGE: "jug_xl" - parallel: - matrix: - - DETECTOR: epic - DETECTOR_BRANCH: - - main - script: - - docker buildx build --load ${BUILD_OPTIONS} - --tag ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH} - --file containers/jug/feature.Dockerfile - --build-arg INTERNAL_TAG=${NIGHTLY_TAG} - --build-arg DETECTOR=${DETECTOR} - --build-arg DETECTOR_BRANCH=${DETECTOR_BRANCH} - containers/jug - - | - PUSH_FLAG="" - if [ "$CI_PIPELINE_SOURCE" == "merge_request_event" ]; then - PUSH_FLAG="--eicweb" - fi - FEATURE_EXPORT_TAG="${VERSION}-${DETECTOR}-${DETECTOR_BRANCH}-stable" - - ./gitlab-ci/docker_push.sh -i ${BUILD_IMAGE} -l ${INTERNAL_TAG}-${DETECTOR}-${DETECTOR_BRANCH} - -n ${DOCKER_NTRIES} -t ${DOCKER_WAIT_TIME} - ${FEATURE_EXPORT_TAG} ${PUSH_FLAG} - .singularity: stage: deploy interruptible: true diff --git a/containers/jug/feature.Dockerfile b/containers/jug/feature.Dockerfile deleted file mode 100644 index acce7cd473547ba2eb31006ffc7dc088f791f49f..0000000000000000000000000000000000000000 --- a/containers/jug/feature.Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -#syntax=docker/dockerfile:1.2 -ARG DOCKER_REGISTRY="eicweb.phy.anl.gov:4567/containers/eic_container/" -ARG INTERNAL_TAG="testing" - -## Make a specific "feature" image, identical to jug_xl except for the detector -## symlinked as default in /opt/detector. Not that these images will be removed -## in the future once we move the detectors already installed in the main -## image. - -FROM ${DOCKER_REGISTRY}jug_xl:${INTERNAL_TAG} - -## also install detector/ip geometries into opt -ARG DETECTOR=athena -ARG DETECTOR_BRANCH=canyonlands -RUN rm -rf /opt/detector/{setup.sh,lib,share} \ - && ln -sf /opt/detector/${DETECTOR}-${DETECTOR_BRANCH}/setup.sh \ - /opt/detector/setup.sh \ - && ln -sf /opt/detector/${DETECTOR}-${DETECTOR_BRANCH}/lib \ - /opt/detector/lib \ - && ln -sf /opt/detector/${DETECTOR}-${DETECTOR_BRANCH}/share \ - /opt/detector/share