This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch 1.40.x
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/1.40.x by this push:
new 2e1b4308ca kie-issues#622: explicitly provide startupTimeout in
waitingFor call (#3259)
2e1b4308ca is described below
commit 2e1b4308ca9799f0adc4dcb66672b5d015c1ee34
Author: Jan Stastny <[email protected]>
AuthorDate: Tue Oct 24 14:42:46 2023 +0200
kie-issues#622: explicitly provide startupTimeout in waitingFor call (#3259)
* kie-issues#622: explicitly provide startupTimeout in waitingFor call
* add PR check triggering Jenkinsfile
---------
Co-authored-by: jstastny-cz <[email protected]>
---
.ci/jenkins/Jenkinsfile.pr.1.40.x | 47 ++++++++++++++++++++++
.../testcontainers/KogitoKafkaContainer.java | 2 +-
.../testcontainers/KogitoKeycloakContainer.java | 2 +-
.../testcontainers/KogitoRedisSearchContainer.java | 2 +-
.../devservices/DataIndexInMemoryContainer.java | 4 +-
5 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.pr.1.40.x
b/.ci/jenkins/Jenkinsfile.pr.1.40.x
new file mode 100644
index 0000000000..232a27175e
--- /dev/null
+++ b/.ci/jenkins/Jenkinsfile.pr.1.40.x
@@ -0,0 +1,47 @@
+@Library('jenkins-pipeline-shared-libraries')_
+
+pr_check_script = null
+
+pipeline {
+ agent {
+ label 'ubuntu'
+ }
+ options {
+ timestamps()
+ timeout(time: 480, unit: 'MINUTES')
+ disableConcurrentBuilds(abortPrevious: true)
+ }
+ environment {
+ BUILDCHAIN_PROJECT = 'apache/incubator-kie-kogito-runtimes'
+
+ ENABLE_SONARCLOUD = 'false'
+ KOGITO_RUNTIMES_BUILD_MVN_OPTS = '-Dvalidate-formatting
-Prun-code-coverage'
+ }
+ stages {
+ stage('Initialize') {
+ steps {
+ script {
+ // load `pr_check.groovy` file from kogito-pipelines:main
+ dir('kogito-pipelines') {
+
checkout(githubscm.resolveRepository('incubator-kie-kogito-pipelines',
'apache', 'main', false, 'ASF_Cloudbees_Jenkins_ci-builds'))
+ pr_check_script = load 'dsl/scripts/pr_check.groovy'
+ }
+ }
+ }
+ }
+ stage('PR check') {
+ steps {
+ script {
+ dir('kogito-pipelines') {
+ pr_check_script.launch()
+ }
+ }
+ }
+ }
+ }
+ post {
+ cleanup {
+ cleanWs()
+ }
+ }
+}
diff --git
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKafkaContainer.java
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKafkaContainer.java
index ea71e21f3c..578077793c 100644
---
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKafkaContainer.java
+++
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKafkaContainer.java
@@ -44,7 +44,7 @@ public class KogitoKafkaContainer extends
KogitoGenericContainer<KogitoKafkaCont
withExposedPorts(KAFKA_PORT);
withCreateContainerCmdModifier(cmd -> cmd.withEntrypoint("sh"));
withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep
0.1; done; " + STARTER_SCRIPT);
- waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1));
+ waitingFor(Wait.forLogMessage(".*Started Kafka API server.*",
1).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT));
}
@Override
diff --git
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKeycloakContainer.java
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKeycloakContainer.java
index 3b10cc1872..cb8971e556 100644
---
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKeycloakContainer.java
+++
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoKeycloakContainer.java
@@ -40,7 +40,7 @@ public class KogitoKeycloakContainer extends
KogitoGenericContainer<KogitoKeyclo
withEnv("KEYCLOAK_ADMIN", USER);
withEnv("KEYCLOAK_ADMIN_PASSWORD", PASSWORD);
withClasspathResourceMapping("testcontainers/keycloak/kogito-realm.json",
REALM_FILE, BindMode.READ_ONLY);
- waitingFor(Wait.forLogMessage(".*Keycloak.*started.*", 1));
+ waitingFor(Wait.forLogMessage(".*Keycloak.*started.*",
1).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT));
withCommand("start-dev --import-realm");
}
diff --git
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoRedisSearchContainer.java
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoRedisSearchContainer.java
index 16e7943b5e..15b8026f06 100644
---
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoRedisSearchContainer.java
+++
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoRedisSearchContainer.java
@@ -26,7 +26,7 @@ public class KogitoRedisSearchContainer extends
KogitoGenericContainer<KogitoRed
public KogitoRedisSearchContainer() {
super(NAME);
addExposedPort(PORT);
- waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\s",
1));
+ waitingFor(Wait.forLogMessage(".*Ready to accept connections.*\\s",
1).withStartupTimeout(Constants.CONTAINER_START_TIMEOUT));
}
@Override
diff --git
a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/devservices/DataIndexInMemoryContainer.java
b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/devservices/DataIndexInMemoryContainer.java
index d91535d4c7..1fef649615 100644
---
a/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/devservices/DataIndexInMemoryContainer.java
+++
b/quarkus/extensions/kogito-quarkus-workflow-extension-common/kogito-quarkus-workflow-common-deployment/src/main/java/org/kie/kogito/quarkus/workflow/deployment/devservices/DataIndexInMemoryContainer.java
@@ -16,6 +16,8 @@
package org.kie.kogito.quarkus.workflow.deployment.devservices;
+import java.time.Duration;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.GenericContainer;
@@ -58,7 +60,7 @@ public class DataIndexInMemoryContainer extends
GenericContainer<DataIndexInMemo
withEnv("KOGITO_DATA_INDEX_VERTX_GRAPHQL_UI_PATH", "/q/graphql-ui");
withEnv("KOGITO_DATA_INDEX_QUARKUS_PROFILE", "http-events-support");
withExposedPorts(PORT);
- waitingFor(Wait.forHttp("/q/health/ready").forStatusCode(200));
+
waitingFor(Wait.forHttp("/q/health/ready").forStatusCode(200).withStartupTimeout(Duration.ofMinutes(5)));
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
