removed ids moved commented out some tests and updated dockerfile to 7200 hours

Author: beckynevin

.github/workflows/test_and_build_cache.yml

@@ -3,6 +3,7 @@ name: cache dependencies, test, and build
 on:
   push:
     branches:
+      - main
     tags:
       - v*
   pull_request:

Dockerfile

@@ -25,12 +25,8 @@ ENV FROMREPO "tests_docker/temp_from"
 ENV TOREPO "tests_docker/temp_to"
 ENV INSTRUMENT "LATISS"
 ENV NOW "2020-03-01 23:59:59.999999"
-ENV EMBARGO_HRS "1063.08018813861"
+ENV EMBARGO_HRS "7200"
 ENV DATAQUERIES '{ "datasettype": "raw", "collections": "LATISS/raw/all"}'
-# ENV DATASETTYPE "raw"
-#'["raw", "calexp"]'
-# ENV COLLECTIONS "LATISS/raw/all"
-#'["LATISS/raw/all", "LATISS/runs/AUXTEL_DRP_IMAGING_2022-11A/w_2022_46/PREOPS-1616"]'
 ENV LOG "True"
 ENV PASTEMBARGO "1.0"
 

src/move_embargo_args.py

@@ -467,23 +467,6 @@ def parse_args():
                     register_dataset_types=True,
                     transfer_dimensions=True,
                 )
-        ids_moved = []
-        for dt in dest_registry.queryDatasets(
-            datasetType=datalist_exposure, collections=collections_exposure
-        ):
-            try:
-                ids_moved.append(dt.dataId.mapping["exposure"])
-            except KeyError:
-                continue
-        """
-        ids_moved = [
-            dt.dataId.mapping["exposure"]
-            for dt in dest_registry.queryDatasets(
-                datasetType=datalist_exposure, collections=collections_exposure
-            )
-        ]
-        """
-        logger.info("exposure ids moved: %s", ids_moved)
     if datalist_visit:  # if there is anything in the list
         # first, run all of the exposure types through
         logger.info("datalist_visit exists: %s", datalist_visit)
@@ -537,24 +520,6 @@ def parse_args():
                 register_dataset_types=True,
                 transfer_dimensions=True,
             )
-        # its breaking here because not everything is a visit in the registry
-        ids_moved = []
-        for dt in dest_registry.queryDatasets(datasetType=..., collections=...):
-            try:
-                ids_moved.append(dt.dataId.mapping["visit"])
-            except KeyError:
-                continue
-        """
-        ids_moved = [
-                dt.dataId.mapping["visit"]
-                for dt in dest_registry.queryDatasets(
-                datasetType=..., collections=...)
-            ]
-        """
-        logger.info("datalist_visit: %s", datalist_visit)
-        logger.info("collections_visit: %s", collections_visit)
-        logger.info("visit ids moved: %s", ids_moved)
-
     if datalist_no_exposure:
         # this is for datatypes that don't have an exposure
         # or visit dimension
@@ -576,15 +541,6 @@ def parse_args():
             register_dataset_types=True,
             transfer_dimensions=True,
         )
-        ids_moved = [
-            dt.id
-            for dt in dest_registry.queryDatasets(
-                datasetType=datalist_no_exposure,
-                collections=collections_no_exposure,
-            )
-        ]
-        logger.info("ids in to butler: %s", ids_moved)
-
     if move == "True":
         # concatenate both dataset types
         combined_datalist = datalist_exposure + datalist_visit + datalist_no_exposure