This is an automated email from the ASF dual-hosted git repository.
fjtiradosarti pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new ded3c77751 [Fixes_kie_issues_1749] Switch dockerhub to a mirrored
registry (#3828)
ded3c77751 is described below
commit ded3c777512b72592ba2f30297c3a7e9095810da
Author: Gonzalo Muñoz <[email protected]>
AuthorDate: Mon Jan 27 13:14:18 2025 +0100
[Fixes_kie_issues_1749] Switch dockerhub to a mirrored registry (#3828)
---
kogito-build/kogito-build-no-bom-parent/pom.xml | 8 ++
.../testcontainers/KogitoPostgreSqlContainer.java | 5 +-
.../testcontainers/KogitoMongoDBContainerTest.java | 2 +-
.../src/test/resources/application.properties | 4 +-
.../src/main/resources/application.properties | 3 +-
.../java/org/kie/kogito/it/PersistenceTest.java | 112 +++++++++++----------
.../src/main/resources/application.properties | 3 +-
.../src/main/resources/application.properties | 3 +-
.../src/main/resources/application.properties | 3 +-
.../quarkus/MongoDBQuarkusTestResourceTest.java | 3 +-
.../MongoDBSpringBootTestResourceTest.java | 3 +-
11 files changed, 89 insertions(+), 60 deletions(-)
diff --git a/kogito-build/kogito-build-no-bom-parent/pom.xml
b/kogito-build/kogito-build-no-bom-parent/pom.xml
index 2795ef00b8..557268c670 100644
--- a/kogito-build/kogito-build-no-bom-parent/pom.xml
+++ b/kogito-build/kogito-build-no-bom-parent/pom.xml
@@ -330,6 +330,10 @@
<maven.repo.local>${session.request.localRepositoryPath.path}</maven.repo.local>
<maven.settings>${session.request.userSettingsFile.path}</maven.settings>
</systemPropertyVariables>
+ <environmentVariables>
+
<TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>mirror.gcr.io/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
+ <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
+ </environmentVariables>
<parallel>all</parallel>
</configuration>
</plugin>
@@ -354,6 +358,10 @@
<maven.settings>${session.request.userSettingsFile.path}</maven.settings>
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
</systemPropertyVariables>
+ <environmentVariables>
+
<TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>mirror.gcr.io/</TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX>
+ <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
+ </environmentVariables>
<parallel>all</parallel>
</configuration>
</plugin>
diff --git
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoPostgreSqlContainer.java
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoPostgreSqlContainer.java
index b631bf23c7..bb066afb23 100644
---
a/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoPostgreSqlContainer.java
+++
b/kogito-test-utils/src/main/java/org/kie/kogito/testcontainers/KogitoPostgreSqlContainer.java
@@ -29,6 +29,9 @@ import org.testcontainers.containers.output.OutputFrame;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
+import org.testcontainers.utility.DockerImageName;
+
+import static
org.kie.kogito.testcontainers.KogitoGenericContainer.getImageName;
/**
* PostgreSQL Container for Kogito examples.
@@ -40,7 +43,7 @@ public class KogitoPostgreSqlContainer extends
PostgreSQLContainer<KogitoPostgre
private static final Logger LOGGER =
LoggerFactory.getLogger(KogitoPostgreSqlContainer.class);
public KogitoPostgreSqlContainer() {
- super(KogitoGenericContainer.getImageName(NAME));
+
super(DockerImageName.parse(getImageName(NAME)).asCompatibleSubstituteFor("postgres"));
withLogConsumer(getLogger());
withLogConsumer(new Slf4jLogConsumer(LOGGER));
withStartupTimeout(Constants.CONTAINER_START_TIMEOUT);
diff --git
a/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java
b/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java
index 65122081c4..a759d0d5d8 100644
---
a/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java
+++
b/kogito-test-utils/src/test/java/org/kie/kogito/testcontainers/KogitoMongoDBContainerTest.java
@@ -54,6 +54,6 @@ class KogitoMongoDBContainerTest {
@Test
void shouldGetDockerImageName() {
assumeTrue(DockerClientFactory.instance().isDockerAvailable(),
"Aborting test: docker env not found");
-
assertThat(container.getDockerImageName()).isEqualTo(System.getProperty(Constants.CONTAINER_NAME_PREFIX
+ KogitoMongoDBContainer.NAME));
+
assertThat(container.getDockerImageName()).isEqualTo(System.getenv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX")
+ System.getProperty(Constants.CONTAINER_NAME_PREFIX +
KogitoMongoDBContainer.NAME));
}
}
diff --git
a/quarkus/addons/events/mongodb/runtime/src/test/resources/application.properties
b/quarkus/addons/events/mongodb/runtime/src/test/resources/application.properties
index 28c3d09819..27cb289fd9 100644
---
a/quarkus/addons/events/mongodb/runtime/src/test/resources/application.properties
+++
b/quarkus/addons/events/mongodb/runtime/src/test/resources/application.properties
@@ -23,4 +23,6 @@ kogito.events.variables.enabled=false
kogito.events.processinstances.collection=testPICollection
kogito.events.usertasks.collection=testUTCollection
kogito.events.variables.collection=testVCollection
-kogito.events.database=testDB
\ No newline at end of file
+kogito.events.database=testDB
+
+quarkus.mongodb.devservices.image-name=mirror.gcr.io/mongo:4.4
diff --git
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties
index 24a07fd6c3..c6c17f5a67 100644
---
a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties
+++
b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties
@@ -23,6 +23,7 @@ quarkus.swagger-ui.always-include=true
kogito.persistence.type=jdbc
kogito.persistence.proto.marshaller=false
quarkus.datasource.db-kind=postgresql
+quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
kie.flyway.enabled=true
quarkus.http.test-port=0
@@ -255,4 +256,4 @@ quarkus.http.auth.permission.default.policy=authenticated
quarkus.security.users.embedded.enabled=true
quarkus.security.users.embedded.plain-text=true
-quarkus.security.users.embedded.users.buddy=buddy
\ No newline at end of file
+quarkus.security.users.embedded.users.buddy=buddy
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
index d9c94d5c5e..b2cfc573d9 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
+++
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-processes-persistence-common/src/test/java/org/kie/kogito/it/PersistenceTest.java
@@ -73,58 +73,68 @@ public abstract class PersistenceTest {
.then()
.statusCode(201)
.body("id", notNullValue()).extract().path("id");
- // get all active approvals
- given()
- .accept(ContentType.JSON)
- .when()
- .get("/AddedTask")
- .then()
- .statusCode(200)
- .body("size()", is(1), "[0].id", is(id));
- // get just started approval
- given()
- .accept(ContentType.JSON)
- .when()
- .get("/AddedTask/" + id)
- .then()
- .statusCode(200)
- .body("id", is(id));
-
- // tasks assigned in just started approval
-
- String userTaskId = given()
- .basePath(USER_TASK_BASE_PATH)
- .queryParam("user", "mary")
- .queryParam("group", "managers")
- .contentType(ContentType.JSON)
- .when()
- .get()
- .then()
- .statusCode(200)
- .extract()
- .body()
- .path("[0].id");
-
- given()
- .contentType(ContentType.JSON)
- .basePath(USER_TASK_BASE_PATH)
- .queryParam("user", "mary")
- .queryParam("group", "managers")
- .body(new TransitionInfo("complete"))
- .when()
- .post("/{userTaskId}/transition", userTaskId)
- .then()
- .statusCode(200);
-
- // get all active approvals
- given()
- .accept(ContentType.JSON)
- .when()
- .get("/AddedTask")
- .then()
- .statusCode(200)
- .body("size()", is(1));
+ try {
+ // get all active approvals
+ given()
+ .accept(ContentType.JSON)
+ .when()
+ .get("/AddedTask")
+ .then()
+ .statusCode(200)
+ .body("size()", is(1), "[0].id", is(id));
+
+ // get just started approval
+ given()
+ .accept(ContentType.JSON)
+ .when()
+ .get("/AddedTask/" + id)
+ .then()
+ .statusCode(200)
+ .body("id", is(id));
+
+ // tasks assigned in just started approval
+
+ String userTaskId = given()
+ .basePath(USER_TASK_BASE_PATH)
+ .queryParam("user", "mary")
+ .queryParam("group", "managers")
+ .contentType(ContentType.JSON)
+ .when()
+ .get()
+ .then()
+ .statusCode(200)
+ .extract()
+ .body()
+ .path("[0].id");
+
+ given()
+ .contentType(ContentType.JSON)
+ .basePath(USER_TASK_BASE_PATH)
+ .queryParam("user", "mary")
+ .queryParam("group", "managers")
+ .body(new TransitionInfo("complete"))
+ .when()
+ .post("/{userTaskId}/transition", userTaskId)
+ .then()
+ .statusCode(200);
+
+ // get all active approvals
+ given()
+ .accept(ContentType.JSON)
+ .when()
+ .get("/AddedTask")
+ .then()
+ .statusCode(200)
+ .body("size()", is(1));
+ } finally {
+ // Cleanup: Remove the AddedTask
+ given()
+ .when()
+ .delete("/AddedTask/" + id)
+ .then()
+ .statusCode(200);
+ }
}
@Test
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/main/resources/application.properties
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/main/resources/application.properties
index 19109e37cd..283c0655b0 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/main/resources/application.properties
+++
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-jdbc/src/main/resources/application.properties
@@ -20,5 +20,6 @@
kogito.persistence.type=jdbc
#run create tables scripts
quarkus.datasource.db-kind=postgresql
+quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
-kie.flyway.enabled=true
\ No newline at end of file
+kie.flyway.enabled=true
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/main/resources/application.properties
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/main/resources/application.properties
index e090cfc7be..ae530d2594 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/main/resources/application.properties
+++
b/quarkus/integration-tests/integration-tests-quarkus-processes-persistence/integration-tests-quarkus-processes-postgresql/src/main/resources/application.properties
@@ -18,5 +18,6 @@
#
kogito.persistence.type=postgresql
+quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
-kie.flyway.enabled=true
\ No newline at end of file
+kie.flyway.enabled=true
diff --git
a/quarkus/integration-tests/integration-tests-quarkus-usertasks/src/main/resources/application.properties
b/quarkus/integration-tests/integration-tests-quarkus-usertasks/src/main/resources/application.properties
index 5458fa57f9..c4b0747666 100644
---
a/quarkus/integration-tests/integration-tests-quarkus-usertasks/src/main/resources/application.properties
+++
b/quarkus/integration-tests/integration-tests-quarkus-usertasks/src/main/resources/application.properties
@@ -18,7 +18,8 @@
#
quarkus.datasource.db-kind=postgresql
+quarkus.datasource.devservices.image-name=mirror.gcr.io/postgres:15.9-alpine3.20
kogito.persistence.type=jdbc
-kie.flyway.enabled=true
\ No newline at end of file
+kie.flyway.enabled=true
diff --git
a/quarkus/test/src/test/java/org/kie/kogito/testcontainers/quarkus/MongoDBQuarkusTestResourceTest.java
b/quarkus/test/src/test/java/org/kie/kogito/testcontainers/quarkus/MongoDBQuarkusTestResourceTest.java
index 0f84426b9b..faeadffb84 100644
---
a/quarkus/test/src/test/java/org/kie/kogito/testcontainers/quarkus/MongoDBQuarkusTestResourceTest.java
+++
b/quarkus/test/src/test/java/org/kie/kogito/testcontainers/quarkus/MongoDBQuarkusTestResourceTest.java
@@ -53,7 +53,8 @@ class MongoDBQuarkusTestResourceTest {
@Test
void shouldGetDockerImageName() {
givenResource();
- assertEquals(System.getProperty(Constants.CONTAINER_NAME_PREFIX +
KogitoMongoDBContainer.NAME), resource.getTestResource().getDockerImageName());
+ assertEquals(System.getenv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX") +
System.getProperty(Constants.CONTAINER_NAME_PREFIX +
KogitoMongoDBContainer.NAME),
+ resource.getTestResource().getDockerImageName());
}
private void givenConditionalResource() {
diff --git
a/springboot/test/src/test/java/org/kie/kogito/testcontainers/springboot/MongoDBSpringBootTestResourceTest.java
b/springboot/test/src/test/java/org/kie/kogito/testcontainers/springboot/MongoDBSpringBootTestResourceTest.java
index 616ae8aee3..947d41e076 100644
---
a/springboot/test/src/test/java/org/kie/kogito/testcontainers/springboot/MongoDBSpringBootTestResourceTest.java
+++
b/springboot/test/src/test/java/org/kie/kogito/testcontainers/springboot/MongoDBSpringBootTestResourceTest.java
@@ -60,7 +60,8 @@ class MongoDBSpringBootTestResourceTest {
@Test
void shouldGetDockerImageName() {
givenResource();
- assertEquals(System.getProperty(Constants.CONTAINER_NAME_PREFIX +
KogitoMongoDBContainer.NAME), resource.getTestResource().getDockerImageName());
+ assertEquals(System.getenv("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX") +
System.getProperty(Constants.CONTAINER_NAME_PREFIX +
KogitoMongoDBContainer.NAME),
+ resource.getTestResource().getDockerImageName());
}
private void givenConditionalResource() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
