From 9a1d92428ca81769f80902b37a38fc0adae74447 Mon Sep 17 00:00:00 2001 From: Kian-Tat Lim Date: Sun, 6 Oct 2024 21:37:51 -0700 Subject: [PATCH 1/2] Fix one-by-one ingestion. --- src/ingest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ingest.py b/src/ingest.py index feb5660..912e351 100644 --- a/src/ingest.py +++ b/src/ingest.py @@ -227,7 +227,7 @@ def main(): refs = [] for resource in resources: try: - refs.append(ingester.run([resource])) + refs.extend(ingester.run([resource])) except Exception: logger.exception("Error while ingesting %s", resource) info = Info.from_path(resource.geturl()) From 6a8a7a3ecb3b5c73e4842066da7f659694e657c2 Mon Sep 17 00:00:00 2001 From: Kian-Tat Lim Date: Sun, 6 Oct 2024 21:38:06 -0700 Subject: [PATCH 2/2] Bump weekly and rubin-env. --- Dockerfile.ingest | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.ingest b/Dockerfile.ingest index 46531c8..0fd3c5f 100644 --- a/Dockerfile.ingest +++ b/Dockerfile.ingest @@ -21,12 +21,12 @@ # Dockerfile for ingest service. -ARG RUBINENV_VERSION=8.0.0 -FROM lsstsqre/newinstall:${RUBINENV_VERSION} +ARG RUBINENV_VERSION=9.0.0 +FROM ghcr.io/lsst-dm/docker-newinstall:9-latest-${RUBINENV_VERSION} ARG OBS_LSST_VERSION -ENV OBS_LSST_VERSION=${OBS_LSST_VERSION:-w_2024_24} +ENV OBS_LSST_VERSION=${OBS_LSST_VERSION:-w_2024_40} USER lsst -RUN source loadLSST.bash && mamba install redis-py rucio-clients +RUN source loadLSST.bash && mamba install redis-py RUN source loadLSST.bash && eups distrib install -t "${OBS_LSST_VERSION}" lsst_obs COPY src/ingest.py src/info.py src/utils.py src/rucio_interface.py ./ingest/ # Environment variables that must be set: