From cabc57dcce4b455a212a50998a3967f257a1fba8 Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni <66294834+hk10111@users.noreply.github.com> Date: Mon, 8 Sep 2025 15:28:51 +0530 Subject: [PATCH 1/6] run integration tests --- .semaphore/semaphore.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 7f514a39cc..bab6ce6dd3 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -122,7 +122,7 @@ blocks: - ci-tools ci-update-version - export OS_PACKAGES_URL=$(echo "$PACKAGES_URL" | sed "s/PACKAGE_TYPE/rpm/g") - export PACKAGING_BUILD_ARGS="$PACKAGING_BUILD_ARGS -DCONFLUENT_PACKAGES_REPO=$OS_PACKAGES_URL" - - mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean install dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY + - mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean install integration-test dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY -DBUILD_NUMBER=$BUILD_NUMBER -DGIT_COMMIT=$GIT_COMMIT -Ddocker.tag=$DOCKER_DEV_TAG$OS_TAG$AMD_ARCH -Ddocker.upstream-tag=$DOCKER_UPSTREAM_TAG$OS_TAG -Darch.type=$AMD_ARCH -Ddocker.os_type=ubi8 $PACKAGING_BUILD_ARGS -Ddependency.check.skip=true $MAVEN_EXTRA_ARGS - . cache-maven store @@ -155,7 +155,7 @@ blocks: - export OS_PACKAGES_URL=$(echo "$PACKAGES_URL" | sed "s/PACKAGE_TYPE/rpm/g") - export PACKAGING_BUILD_ARGS="$PACKAGING_BUILD_ARGS -DCONFLUENT_PACKAGES_REPO=$OS_PACKAGES_URL" - ci-tools ci-update-version - - mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean install dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY + - mvn -Dmaven.wagon.http.retryHandler.count=3 --batch-mode -P jenkins,docker clean install integration-test dependency:analyze validate -U -Ddocker.registry=$DOCKER_DEV_REGISTRY -Ddocker.upstream-registry=$DOCKER_UPSTREAM_REGISTRY -DBUILD_NUMBER=$BUILD_NUMBER -DGIT_COMMIT=$GIT_COMMIT -Ddocker.tag=$DOCKER_DEV_TAG$OS_TAG$ARM_ARCH -Ddocker.upstream-tag=$DOCKER_UPSTREAM_TAG$OS_TAG -Darch.type=$ARM_ARCH -Ddocker.os_type=ubi8 $PACKAGING_BUILD_ARGS -Ddependency.check.skip=true $MAVEN_EXTRA_ARGS - . cache-maven store From 4f3dad2110a39bd8eab88f9eacb060fda41c6df1 Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni Date: Mon, 8 Sep 2025 15:30:55 +0530 Subject: [PATCH 2/6] test docker utils --- base/Dockerfile.ubi8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8 index e946cfbd2e..d415a35abd 100644 --- a/base/Dockerfile.ubi8 +++ b/base/Dockerfile.ubi8 @@ -74,7 +74,7 @@ ARG PYTHON_SETUPTOOLS_VERSION="" ARG PYTHON_CONFLUENT_DOCKER_UTILS_VERSION="master" # This can be overriden for an offline/air-gapped builds -ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@${PYTHON_CONFLUENT_DOCKER_UTILS_VERSION}" +ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@$replace-docker-compose" RUN microdnf --nodocs install yum \ && rpm --import https://www.azul.com/files/0xB1998361219BD9C9.txt \ From 0f6f89b43b053c4a3ddc74188703c839b8a64b7b Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni Date: Thu, 11 Sep 2025 09:43:21 +0530 Subject: [PATCH 3/6] add test jars --- docker-utils/pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-utils/pom.xml b/docker-utils/pom.xml index c03efb71ee..43fa277b1a 100644 --- a/docker-utils/pom.xml +++ b/docker-utils/pom.xml @@ -96,6 +96,9 @@ test-jar + + tests + From 3bb5e55f38e56e19ac2012313c365388b9bf69bd Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni Date: Thu, 11 Sep 2025 09:52:25 +0530 Subject: [PATCH 4/6] add a phase --- docker-utils/pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-utils/pom.xml b/docker-utils/pom.xml index 43fa277b1a..d70265b959 100644 --- a/docker-utils/pom.xml +++ b/docker-utils/pom.xml @@ -96,9 +96,7 @@ test-jar - - tests - + none From 1b5db4c12e9dfa774340313744ab10c8ea4fc5df Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni Date: Thu, 11 Sep 2025 09:57:25 +0530 Subject: [PATCH 5/6] minor fix --- docker-utils/pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-utils/pom.xml b/docker-utils/pom.xml index d70265b959..89cb048bdc 100644 --- a/docker-utils/pom.xml +++ b/docker-utils/pom.xml @@ -93,9 +93,7 @@ ${maven-jar-plugin.version} - - test-jar - + default-jar none From 8462db553e6d0d45336d836ff93c677319cd36a9 Mon Sep 17 00:00:00 2001 From: Hrithik Kulkarni Date: Thu, 11 Sep 2025 11:10:04 +0530 Subject: [PATCH 6/6] minor fix --- base/Dockerfile.ubi8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile.ubi8 b/base/Dockerfile.ubi8 index d415a35abd..8be2932523 100644 --- a/base/Dockerfile.ubi8 +++ b/base/Dockerfile.ubi8 @@ -74,7 +74,7 @@ ARG PYTHON_SETUPTOOLS_VERSION="" ARG PYTHON_CONFLUENT_DOCKER_UTILS_VERSION="master" # This can be overriden for an offline/air-gapped builds -ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@$replace-docker-compose" +ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@replace-docker-compose" RUN microdnf --nodocs install yum \ && rpm --import https://www.azul.com/files/0xB1998361219BD9C9.txt \