.gitlab-ci.yml

@@ -3,8 +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: "v9.2.0"
-  EICRECON_VERSION: "v0.5.1"
+  JUGGLER_VERSION: "v9.3.0"
+  EICRECON_VERSION: "v0.5.4"
 
   ## Spack organization and repository, e.g. spack/spack
   SPACK_ORGREPO: "spack/spack"
@@ -384,6 +384,7 @@ jug_xl:nightly:
                    ${PLATFORM:+--platform ${PLATFORM}}
                    --build-arg BASE_IMAGE=${BASE_IMAGE}
                    --build-arg INTERNAL_TAG=${INTERNAL_TAG}
+                   --build-arg EICRECON_VERSION=${EICRECON_VERSION}
                    --build-arg JUG_VERSION=nightly-$(date +%Y-%m-%d_%H-%M-%S)-${INTERNAL_TAG}-$(git rev-parse HEAD)
                    --build-arg NIGHTLY=1
                    containers/jug

VERSION

-22.12.0
+23.02.0

containers/jug/xl.Dockerfile

@@ -90,27 +90,26 @@ ARG CAMPAIGNS_HEPMC3_VERSION="main"
 ARG CAMPAIGNS_CONDOR_VERSION="main"
 ARG CAMPAIGNS_SLURM_VERSION="main"
 ## cache bust when updated repositories
-ADD ${EICWEB}/482/repository/tree?ref=${CAMPAIGNS_SINGLE_VERSION} /tmp/482.json
-ADD ${EICWEB}/483/repository/tree?ref=${CAMPAIGNS_HEPMC3_VERSION} /tmp/483.json
-ADD ${EICWEB}/484/repository/tree?ref=${CAMPAIGNS_CONDOR_VERSION} /tmp/484.json
-ADD ${EICWEB}/485/repository/tree?ref=${CAMPAIGNS_SLURM_VERSION} /tmp/485.json
+ADD https://api.github.com/repos/eic/simulation_campaign_single/commits/${CAMPAIGNS_SINGLE_VERSION} /tmp/simulation_campaign_single.json
+ADD https://api.github.com/repos/eic/simulation_campaign_hepmc3/commits/${CAMPAIGNS_HEPMC3_VERSION} /tmp/simulation_campaign_hepmc3.json
+ADD https://api.github.com/repos/eic/job_submission_condor/commits/${CAMPAIGNS_CONDOR_VERSION} /tmp/job_submission_condor.json
+ADD https://api.github.com/repos/eic/job_submission_slurm/commits/${CAMPAIGNS_SLURM_VERSION} /tmp/job_submission_slurm.json
 RUN mkdir -p /opt/campaigns                                                     \
  && cd /opt/campaigns                                                           \
  && git clone -b ${CAMPAIGNS_SINGLE_VERSION} --depth 1                          \
-        https://eicweb.phy.anl.gov/EIC/campaigns/single.git                     \
+        https://github.com/eic/simulation_campaign_single.git single            \
  && mkdir -p /opt/campaigns                                                     \
  && cd /opt/campaigns                                                           \
  && git clone -b ${CAMPAIGNS_HEPMC3_VERSION} --depth 1                          \
-        https://eicweb.phy.anl.gov/EIC/campaigns/hepmc3.git                     \
+        https://github.com/eic/simulation_campaign_hepmc3.git hepmc3            \
  && mkdir -p /opt/campaigns                                                     \
  && cd /opt/campaigns                                                           \
  && git clone -b ${CAMPAIGNS_CONDOR_VERSION} --depth 1                          \
-        https://eicweb.phy.anl.gov/EIC/campaigns/condor.git                     \
+        https://github.com/eic/job_submission_condor.git condor                 \
  && mkdir -p /opt/campaigns                                                     \
  && cd /opt/campaigns                                                           \
  && git clone -b ${CAMPAIGNS_SLURM_VERSION} --depth 1                           \
-        https://eicweb.phy.anl.gov/EIC/campaigns/slurm.git
-
+        https://github.com/eic/job_submission_slurm.git slurm
 ## also install detector/ip geometries into opt
 ARG NIGHTLY=''
 ## cache bust when updated repositories