Skip to content

Commit 148181b

Browse files
KyleAureKyleAure
authored
Merge pull request #30601 from KyleAure/bb303535-db2-timeout
2 parents 827cd61 + af06b0d commit 148181b

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎dev/com.ibm.ws.jdbc_fat_db2/fat/src/com/ibm/ws/jdbc/fat/db2/FATSuite.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2024 IBM Corporation and others.
2+
* Copyright (c) 2017, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -44,10 +44,10 @@ public class FATSuite extends TestContainerSuite {
4444
.withPassword("password") // set in Dockerfile
4545
.withDatabaseName("testdb") // set in Dockerfile
4646
.withExposedPorts(50000, 50001) // 50k is regular 50001 is secure
47-
// Use 5m timeout for local runs, 25m timeout for remote runs (extra time since the DB2 container can be slow to start)
47+
// Use 5m timeout for local runs, 35m timeout for remote runs (extra time since the DB2 container can be slow to start)
4848
.waitingFor(new LogMessageWaitStrategy()
4949
.withRegEx(".*DB2 SSH SETUP DONE.*")
50-
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE ? 5 : 25)))
50+
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE ? 5 : 35)))
5151
.withLogConsumer(new SimpleLogConsumer(FATSuite.class, "db2-ssl"))
5252
.withReuse(true);
5353
}

‎dev/com.ibm.ws.jdbc_fat_krb5/fat/src/com/ibm/ws/jdbc/fat/krb5/containers/DB2KerberosContainer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2020, 2024 IBM Corporation and others.
2+
* Copyright (c) 2020, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -47,7 +47,7 @@ protected void configure() {
4747
withEnv("DB2_KRB5_PRINCIPAL", "[email protected]");
4848
waitingFor(new LogMessageWaitStrategy()
4949
.withRegEx("^.*SETUP SCRIPT COMPLETE.*$")
50-
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE ? 10 : 25)));
50+
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE ? 10 : 35)));
5151
withLogConsumer(new SimpleLogConsumer(c, "DB2"));
5252
}
5353

‎dev/fattest.simplicity/src/componenttest/topology/database/container/DatabaseContainerFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2019, 2024 IBM Corporation and others.
2+
* Copyright (c) 2019, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -138,7 +138,7 @@ private static JdbcDatabaseContainer<?> initContainer(DatabaseContainerType dbCo
138138
db2.acceptLicense();
139139
//Add startup timeout since DB2 tends to take longer than the default 3 minutes on build machines.
140140
// TODO figure out if there is a way to create a 'fast-start' image that has the database already created.
141-
db2.withStartupTimeout(getContainerTimeout(5, 25));
141+
db2.withStartupTimeout(getContainerTimeout(5, 35));
142142

143143
break;
144144
case Derby:

‎dev/fattest.simplicity/test/componenttest/topology/database/container/DatabaseContainerFactoryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2023, 2024 IBM Corporation and others.
2+
* Copyright (c) 2023, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -49,7 +49,7 @@ public void testDB2ContainerCreation() throws Exception {
4949
Duration startupTimeout = getField(LogMessageWaitStrategy.class, _waitStrategy, "startupTimeout", Duration.class);
5050
if (startupTimeout.toMinutes() == 5) {
5151
assertTrue(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE);
52-
} else if (startupTimeout.toMinutes() == 25) {
52+
} else if (startupTimeout.toMinutes() == 35) {
5353
assertFalse(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE);
5454
} else {
5555
fail("Unexpected startupTimeout " + startupTimeout.toMinutes() + " should have been either 5 or 15 minutes");

‎dev/io.openliberty.checkpoint_fat_persistence/fat/src/io/openliberty/checkpoint/fat/DB2Test.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2024 IBM Corporation and others.
2+
* Copyright (c) 2017, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -62,10 +62,10 @@ public class DB2Test extends FATServletClient {
6262
.withPassword("password") // set in Dockerfile
6363
.withDatabaseName("testdb") // set in Dockerfile
6464
.withExposedPorts(50000, 50001) // 50k is regular 50001 is secure
65-
// Use 5m timeout for local runs, 25m timeout for remote runs (extra time since the DB2 container can be slow to start)
65+
// Use 5m timeout for local runs, 35m timeout for remote runs (extra time since the DB2 container can be slow to start)
6666
.waitingFor(new LogMessageWaitStrategy()
6767
.withRegEx(".*DB2 SSH SETUP DONE.*")
68-
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE ? 5 : 25)))
68+
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN && !FATRunner.ARM_ARCHITECTURE ? 5 : 35)))
6969
.withLogConsumer(new SimpleLogConsumer(FATSuite.class, "db2-ssl"))
7070
.withReuse(true);
7171

‎dev/io.openliberty.checkpoint_fat_persistence/fat/src/io/openliberty/checkpoint/fat/JPATest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2017, 2024 IBM Corporation and others.
2+
* Copyright (c) 2017, 2025 IBM Corporation and others.
33
* All rights reserved. This program and the accompanying materials
44
* are made available under the terms of the Eclipse Public License 2.0
55
* which accompanies this distribution, and is available at
@@ -67,10 +67,10 @@ public class JPATest {
6767
.withPassword("password") // set in Dockerfile
6868
.withDatabaseName("testdb") // set in Dockerfile
6969
.withExposedPorts(50000, 50001) // 50k is regular 50001 is secure
70-
// Use 5m timeout for local runs, 25m timeout for remote runs (extra time since the DB2 container can be slow to start)
70+
// Use 5m timeout for local runs, 35m timeout for remote runs (extra time since the DB2 container can be slow to start)
7171
.waitingFor(new LogMessageWaitStrategy()
7272
.withRegEx(".*DB2 SSH SETUP DONE.*")
73-
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN ? 5 : 25)))
73+
.withStartupTimeout(Duration.ofMinutes(FATRunner.FAT_TEST_LOCALRUN ? 5 : 35)))
7474
.withLogConsumer(new SimpleLogConsumer(FATSuite.class, "db2-ssl"))
7575
.withReuse(true);
7676

0 commit comments

Comments
 (0)