From 5c0f827839775956c9985a4443e9a9e4011fccb6 Mon Sep 17 00:00:00 2001 From: Michael Reuter Date: Wed, 11 Dec 2024 16:29:35 -0700 Subject: [PATCH 1/4] Extra pipeline options are not longer available. --- .../IntegrationTests/configs/image_taking_configs.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py b/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py index 776892ae..22ba354c 100644 --- a/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py +++ b/python/lsst/ts/IntegrationTests/configs/image_taking_configs.py @@ -58,11 +58,6 @@ "script_mode": "BIAS_DARK_FLAT", "do_defects": True, "certify_calib_begin_date": "replace_me", - "config_options_bias": "-c biasIsr:doDefect=False", - "config_options_dark": "-c darkIsr:doDefect=False", - "config_options_flat": "-c flatIsr:doDefect=False", - "config_options_defects": "-c defectIsr:doDefect=False", - "config_options_ptc": "-c ptcIsr:doCrosstalk=False", }, explicit_start=True, canonical=True, @@ -127,11 +122,6 @@ "do_defects": True, "do_ptc": True, "certify_calib_begin_date": "replace_me", - "config_options_bias": "-c biasIsr:doDefect=False", - "config_options_dark": "-c darkIsr:doDefect=False", - "config_options_flat": "-c flatIsr:doDefect=False", - "config_options_defects": "-c defectIsr:doDefect=False", - "config_options_ptc": "-c ptcIsr:doCrosstalk=False", }, explicit_start=True, canonical=True, From 78e7b6e89eaf39b35c5f4ef915e0638a751e6fb0 Mon Sep 17 00:00:00 2001 From: Sebastian Aranda Sanchez Date: Thu, 12 Dec 2024 16:29:23 -0300 Subject: [PATCH 2/4] Allow scripts to be run with specific log levels. --- python/lsst/ts/IntegrationTests/base_script.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/lsst/ts/IntegrationTests/base_script.py b/python/lsst/ts/IntegrationTests/base_script.py index 97d14db7..85f5fed1 100644 --- a/python/lsst/ts/IntegrationTests/base_script.py +++ b/python/lsst/ts/IntegrationTests/base_script.py @@ -201,7 +201,7 @@ async def run(self) -> None: isStandard=script[1], path=script[0], config=config, - logLevel=10, + logLevel=self.log_level if hasattr(self, "log_level") else 10, location=queue_placement, ) try: From 18b8c4a575200b0aea9f881c6691af8537909df1 Mon Sep 17 00:00:00 2001 From: Sebastian Aranda Sanchez Date: Thu, 12 Dec 2024 16:29:32 -0300 Subject: [PATCH 3/4] Set love_stress_test script log level to 20 (INFO). --- python/lsst/ts/IntegrationTests/love_stress_test.py | 3 ++- tests/test_love_stress.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/python/lsst/ts/IntegrationTests/love_stress_test.py b/python/lsst/ts/IntegrationTests/love_stress_test.py index f3e13d2d..ea3866c4 100644 --- a/python/lsst/ts/IntegrationTests/love_stress_test.py +++ b/python/lsst/ts/IntegrationTests/love_stress_test.py @@ -52,11 +52,12 @@ class LoveStressTest(BaseScript): ("make_love_stress_tests.py", BaseScript.is_external), ] - def __init__(self, test_env: str, k8s: bool = False) -> None: + def __init__(self, test_env: str, k8s: bool = False, log_level: int = 20) -> None: super().__init__() # Set the LOVE location based on test environment self.test_env = test_env self.k8s = k8s + self.log_level = log_level self.env_configs = yaml.safe_load(registry["love_stress"]) if test_env.lower() == "summit": # Running on Summit diff --git a/tests/test_love_stress.py b/tests/test_love_stress.py index 101ff5e6..626895b2 100644 --- a/tests/test_love_stress.py +++ b/tests/test_love_stress.py @@ -65,6 +65,8 @@ async def test_love_stress(self) -> None: self.assertEqual(script_class.script_states, [8]) # Assert location is correct. self.assertEqual(script_config["location"], "http://love01.ls.lsst.org") + # Assert script is run in INFO mode. + self.assertEqual(script_class.log_level, 20) async def test_love_stress_on_k8s(self) -> None: """Execute the LoveStress integration test script on the kubernetes @@ -91,6 +93,8 @@ async def test_love_stress_on_k8s(self) -> None: self.assertEqual(script_class.script_states, [8]) # Assert location is correct. self.assertEqual(script_config["location"], "https://base-lsp.lsst.codes/love") + # Assert script is run in INFO mode. + self.assertEqual(script_class.log_level, 20) async def asyncTearDown(self) -> None: await self.controller.close() From 68fc478b5fbf3f3a868d64a849f4b7b5c92361d0 Mon Sep 17 00:00:00 2001 From: Sebastian Aranda Sanchez Date: Thu, 12 Dec 2024 16:35:23 -0300 Subject: [PATCH 4/4] Update version-history. --- doc/version-history.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/version-history.rst b/doc/version-history.rst index e6401e9c..4dec4426 100644 --- a/doc/version-history.rst +++ b/doc/version-history.rst @@ -10,6 +10,10 @@ Version History .. No new work should be required in order to complete this section. .. Below is an example of a version history format. +v0.30.0 +------- +* Allow scripts to be run with specific log levels. + v0.29.0 ------- * ESS index updates.