From e88e30f8a84466eb5fbc6c93f9faca1b3a7ae976 Mon Sep 17 00:00:00 2001 From: zack-rma Date: Tue, 15 Jul 2025 09:26:49 -0700 Subject: [PATCH 1/5] Enabled LRTS tests for Forecast Spec. --- .../test/java/cwms/cda/api/ForecastSpecControllerTestIT.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java b/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java index f3a7e1b57..a5ca08cf5 100644 --- a/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java +++ b/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java @@ -8,7 +8,6 @@ import fixtures.CwmsDataApiSetupCallback; import fixtures.TestAccounts; import io.restassured.filter.log.LogDetail; -import org.junit.jupiter.api.Disabled; import usace.cwms.db.jooq.codegen.packages.CWMS_FCST_PACKAGE; import org.apache.commons.io.IOUtils; @@ -253,7 +252,6 @@ void test_create_get_delete_get() throws Exception { } @Test - @Disabled("Disabled until the retrieval returns the new LRTS interval identifier") void test_create_get_delete_get_lrts() throws Exception { // Structure of test: From e74ecd110ea4595103886ca1a4d492f3b7fa5246 Mon Sep 17 00:00:00 2001 From: zack-rma Date: Tue, 15 Jul 2025 11:22:29 -0700 Subject: [PATCH 2/5] Updated test for build error --- .../cwms/cda/api/ForecastSpecControllerTestIT.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java b/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java index a5ca08cf5..183f9d378 100644 --- a/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java +++ b/cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java @@ -253,16 +253,13 @@ void test_create_get_delete_get() throws Exception { @Test void test_create_get_delete_get_lrts() throws Exception { - // Structure of test: - // - // 1)Create the spec - // 2)Retrieve the spec and assert that it exists - // 3)Delete the spec - // 4)Retrieve the spec and assert that it does not exist + // 1) Create the spec + // 2) Retrieve the spec and assert that it exists + // 3) Delete the spec + // 4) Retrieve the spec and assert that it does not exist String specId = "TEST-SPEC-LRTS"; - TestAccounts.KeyUser user = TestAccounts.KeyUser.SPK_NORMAL; // Step 1) @@ -314,7 +311,9 @@ void test_create_get_delete_get_lrts() throws Exception { .body("time-series-ids[1]", equalTo("TsBinTestLoc.Flow.Ave.1DayLocal.1Day.tsid2")) .body("time-series-ids[2]", equalTo("TsBinTestLoc.Flow.Ave.1DayLocal.1Day.tsid3")) ; + truncateFcstTimeSeries(); + // Step 3) // Delete the spec given() From 1706ad5cb6d9f1a519a83d9a560102f71fc82782 Mon Sep 17 00:00:00 2001 From: zack-rma Date: Thu, 24 Jul 2025 10:08:12 -0700 Subject: [PATCH 3/5] Updated pull policy to grab latest database schema --- .../src/test/java/fixtures/CwmsDataApiSetupCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java index 9f76b5d5a..edc4c3e5f 100644 --- a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java +++ b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java @@ -123,7 +123,7 @@ public void beforeAll(ExtensionContext context) throws Exception { .withOfficeId("HQ") .withVolumeName(TeamCityUtilities.cleanupBranchName(ORACLE_VOLUME)) .withSchemaImage(CWMS_DB_IMAGE); - cwmsDb.withImagePullPolicy(PullPolicy.defaultPolicy()); + cwmsDb.withImagePullPolicy(PullPolicy.alwaysPull()); cwmsDb.start(); final String jdbcUrl = cwmsDb.getJdbcUrl(); From 6fc9923731af90c9e35788a0870435601cec84b9 Mon Sep 17 00:00:00 2001 From: zack-rma Date: Thu, 24 Jul 2025 15:01:46 -0700 Subject: [PATCH 4/5] Updated DB image URL to point to GitHub registry --- .../src/test/java/fixtures/CwmsDataApiSetupCallback.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java index edc4c3e5f..75d2c224e 100644 --- a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java +++ b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java @@ -49,7 +49,7 @@ public class CwmsDataApiSetupCallback implements BeforeAllCallback,AfterAllCallb private static final String ORACLE_IMAGE = System.getProperty("CDA.oracle.database.image", - "registry-public.hecdev.net/cwms/database-ready-ora-23.5:latest-dev" + "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:latest-dev" ); private static final String ORACLE_VOLUME = System.getProperty("CDA.oracle.database.volume", @@ -57,7 +57,7 @@ public class CwmsDataApiSetupCallback implements BeforeAllCallback,AfterAllCallb ); static final String CWMS_DB_IMAGE = System.getProperty("CDA.cwms.database.image", - "registry.hecdev.net/cwms/schema_installer:99.99.99.11-CDA_STAGING" + "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/schema_installer:latest-dev" ); From c3810097ed55ee09dd7cb73cd22b9cd100f02483 Mon Sep 17 00:00:00 2001 From: zack-rma Date: Fri, 25 Jul 2025 08:45:59 -0700 Subject: [PATCH 5/5] Reverted to default policy --- .../src/test/java/fixtures/CwmsDataApiSetupCallback.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java index 75d2c224e..f67cc3d05 100644 --- a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java +++ b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java @@ -123,7 +123,7 @@ public void beforeAll(ExtensionContext context) throws Exception { .withOfficeId("HQ") .withVolumeName(TeamCityUtilities.cleanupBranchName(ORACLE_VOLUME)) .withSchemaImage(CWMS_DB_IMAGE); - cwmsDb.withImagePullPolicy(PullPolicy.alwaysPull()); + cwmsDb.withImagePullPolicy(PullPolicy.defaultPolicy()); cwmsDb.start(); final String jdbcUrl = cwmsDb.getJdbcUrl();