Merge pull request #260 from PanDAWMS/dev

core | update conf for jobsarchive_y2021

core/pandajob/models.py

@@ -366,4 +366,10 @@ class Meta:
 class Jobsarchived_y2020(PandaJobArch):
     class Meta:
         db_table = f'"{settings.DB_SCHEMA_PANDA_ARCH}"."y2020_jobsarchived"'
+        app_label = 'pandaarch'
+
+
+class Jobsarchived_y2021(PandaJobArch):
+    class Meta:
+        db_table = f'"{settings.DB_SCHEMA_PANDA_ARCH}"."y2021_jobsarchived"'
         app_label = 'pandaarch'

core/pandajob/utils.py

@@ -1,7 +1,7 @@
 """"""
 import logging
 from core.pandajob.models import Jobsarchived_y2014, Jobsarchived_y2015, Jobsarchived_y2016, Jobsarchived_y2017, \
-    Jobsarchived_y2018, Jobsarchived_y2019, Jobsarchived_y2020, Jobsarchived, Jobsarchived4
+    Jobsarchived_y2018, Jobsarchived_y2019, Jobsarchived_y2020, Jobsarchived_y2021,  Jobsarchived, Jobsarchived4
 from core.libs.datetimestrings import parse_datetime
 from core.libs.job import is_event_service
 from core.libs.exlib import get_event_status_summary, split_into_intervals
@@ -27,16 +27,16 @@ def get_pandajob_models_by_year(timewindow):
             2018: [Jobsarchived_y2018, ],
             2019: [Jobsarchived_y2019, ],
             2020: [Jobsarchived_y2020, ],
-            2021: [Jobsarchived, ],
+            2021: [Jobsarchived_y2021, ],
             2022: [Jobsarchived, ],
-            2023: [Jobsarchived, Jobsarchived4],
+            2023: [Jobsarchived, ],
+            2024: [Jobsarchived, Jobsarchived4],
         }
     else:
         pjm_year_dict = {
-            2020: [Jobsarchived, ],
-            2021: [Jobsarchived, ],
             2022: [Jobsarchived, ],
-            2023: [Jobsarchived, Jobsarchived4],
+            2023: [Jobsarchived, ],
+            2024: [Jobsarchived, Jobsarchived4],
         }
     pandajob_models = []
 
@@ -69,6 +69,7 @@ def get_pandajob_arch_models_by_year(timewindow):
             2018: [Jobsarchived_y2018, ],
             2019: [Jobsarchived_y2019, ],
             2020: [Jobsarchived_y2020, ],
+            2021: [Jobsarchived_y2021, ],
         }
 
     pandajob_models = []