This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 7121adeb2db8 Added first iteration of filter inclusion/exclusion for
upgrading test-infra container images version (#20356)
7121adeb2db8 is described below
commit 7121adeb2db80eb694b9e8ea23740653a934ec8a
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Dec 11 12:03:40 2025 +0100
Added first iteration of filter inclusion/exclusion for upgrading
test-infra container images version (#20356)
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../org/apache/camel/test/infra/artemis/services/container.properties | 1 +
.../org/apache/camel/test/infra/aws2/services/container.properties | 1 +
.../camel/test/infra/elasticsearch/services/container.properties | 1 +
.../camel/test/infra/google/pubsub/services/container.properties | 3 ++-
.../camel/test/infra/hashicorp/vault/services/container.properties | 1 +
.../org/apache/camel/test/infra/ibmmq/services/container.properties | 3 ++-
.../org/apache/camel/test/infra/iggy/services/container.properties | 3 ++-
.../apache/camel/test/infra/infinispan/services/container.properties | 1 +
.../org/apache/camel/test/infra/kafka/services/container.properties | 3 +++
.../camel/test/infra/microprofile/lra/services/container.properties | 1 +
.../org/apache/camel/test/infra/minio/services/container.properties | 1 +
.../org/apache/camel/test/infra/mongodb/services/container.properties | 2 ++
.../org/apache/camel/test/infra/nats/services/container.properties | 1 +
.../org/apache/camel/test/infra/neo4j/services/container.properties | 1 +
.../org/apache/camel/test/infra/openldap/services/container.properties | 3 ++-
.../org/apache/camel/test/infra/postgres/services/container.properties | 1 +
.../org/apache/camel/test/infra/rabbitmq/services/container.properties | 2 ++
.../org/apache/camel/test/infra/redis/services/container.properties | 2 ++
.../org/apache/camel/test/infra/solr/services/container.properties | 1 +
.../camel/test/infra/tensorflow/serving/services/container.properties | 2 ++
.../org/apache/camel/test/infra/weaviate/services/container.properties | 1 +
.../apache/camel/test/infra/zookeeper/services/container.properties | 3 ++-
22 files changed, 33 insertions(+), 5 deletions(-)
diff --git
a/test-infra/camel-test-infra-artemis/src/main/resources/org/apache/camel/test/infra/artemis/services/container.properties
b/test-infra/camel-test-infra-artemis/src/main/resources/org/apache/camel/test/infra/artemis/services/container.properties
index 33b50ab09f14..a27dbedd5e77 100644
---
a/test-infra/camel-test-infra-artemis/src/main/resources/org/apache/camel/test/infra/artemis/services/container.properties
+++
b/test-infra/camel-test-infra-artemis/src/main/resources/org/apache/camel/test/infra/artemis/services/container.properties
@@ -16,3 +16,4 @@
## ---------------------------------------------------------------------------
artemis.container=quay.io/artemiscloud/activemq-artemis-broker:latest
artemis.container.ppc64le=icr.io/ppc64le-oss/activemq-artemis-broker-ppc64le:2.0.2
+artemis.container.version.exclude=dev,latest
diff --git
a/test-infra/camel-test-infra-aws-v2/src/main/resources/org/apache/camel/test/infra/aws2/services/container.properties
b/test-infra/camel-test-infra-aws-v2/src/main/resources/org/apache/camel/test/infra/aws2/services/container.properties
index e10b6f9aa9a7..6625787efb3a 100644
---
a/test-infra/camel-test-infra-aws-v2/src/main/resources/org/apache/camel/test/infra/aws2/services/container.properties
+++
b/test-infra/camel-test-infra-aws-v2/src/main/resources/org/apache/camel/test/infra/aws2/services/container.properties
@@ -16,3 +16,4 @@
## ---------------------------------------------------------------------------
aws.container=mirror.gcr.io/localstack/localstack:stable
+aws.container.version.exclude=amd64,arm64,ppc64le,s390x,x86_64,latest,stable
diff --git
a/test-infra/camel-test-infra-elasticsearch/src/main/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties
b/test-infra/camel-test-infra-elasticsearch/src/main/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties
index 793685ba1e15..3b4c75e86777 100644
---
a/test-infra/camel-test-infra-elasticsearch/src/main/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties
+++
b/test-infra/camel-test-infra-elasticsearch/src/main/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties
@@ -17,3 +17,4 @@
elasticsearch.container=docker.elastic.co/elasticsearch/elasticsearch:9.1.0
# IT tests are currently deactivated on ppc64le until an image for 9.x is
available
elasticsearch.container.ppc64le=icr.io/ppc64le-oss/elasticsearch-ppc64le:8.3.3
+elasticsearch.container.ppc64le.version.exclude=x86_64,amd64,arm64
diff --git
a/test-infra/camel-test-infra-google-pubsub/src/main/resources/org/apache/camel/test/infra/google/pubsub/services/container.properties
b/test-infra/camel-test-infra-google-pubsub/src/main/resources/org/apache/camel/test/infra/google/pubsub/services/container.properties
index b3af19e51e0f..4fa2e6e8419f 100644
---
a/test-infra/camel-test-infra-google-pubsub/src/main/resources/org/apache/camel/test/infra/google/pubsub/services/container.properties
+++
b/test-infra/camel-test-infra-google-pubsub/src/main/resources/org/apache/camel/test/infra/google/pubsub/services/container.properties
@@ -14,4 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-google.pubsub.container=gcr.io/google.com/cloudsdktool/cloud-sdk:emulators
\ No newline at end of file
+google.pubsub.container=gcr.io/google.com/cloudsdktool/cloud-sdk:emulators
+google.pubsub.container.version.exclude=stable,alpine,slim,debian,latest
diff --git
a/test-infra/camel-test-infra-hashicorp-vault/src/main/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
b/test-infra/camel-test-infra-hashicorp-vault/src/main/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
index d6d637badbc9..62c388dd990a 100644
---
a/test-infra/camel-test-infra-hashicorp-vault/src/main/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
+++
b/test-infra/camel-test-infra-hashicorp-vault/src/main/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties
@@ -17,3 +17,4 @@
hashicorp.vault.container=mirror.gcr.io/hashicorp/vault:1.21.1
hashicorp.vault.container.ppc64le=icr.io/ppc64le-oss/vault-ppc64le:v1.13.1
+hashicorp.vault.container.version.exclude=rc,beta,alpha
diff --git
a/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties
b/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties
index b6112d35d62e..1cd5f7949623 100644
---
a/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties
+++
b/test-infra/camel-test-infra-ibmmq/src/main/resources/org/apache/camel/test/infra/ibmmq/services/container.properties
@@ -14,4 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-ibm.mq.container=icr.io/ibm-messaging/mq:9.3.2.0-r2
\ No newline at end of file
+ibm.mq.container=icr.io/ibm-messaging/mq:9.3.2.0-r2
+ibm.mq.container.version.exclude=amd64,arm64,ppc64le,s390x,x86_64
diff --git
a/test-infra/camel-test-infra-iggy/src/main/resources/org/apache/camel/test/infra/iggy/services/container.properties
b/test-infra/camel-test-infra-iggy/src/main/resources/org/apache/camel/test/infra/iggy/services/container.properties
index 6b164aed3094..6d0c52a84769 100644
---
a/test-infra/camel-test-infra-iggy/src/main/resources/org/apache/camel/test/infra/iggy/services/container.properties
+++
b/test-infra/camel-test-infra-iggy/src/main/resources/org/apache/camel/test/infra/iggy/services/container.properties
@@ -14,4 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-iggy.container=apache/iggy:0.6.0
\ No newline at end of file
+iggy.container=apache/iggy:0.6.0
+iggy.container.version.exclude=edge,buildcache,dev,rc,beta,alpha
diff --git
a/test-infra/camel-test-infra-infinispan/src/main/resources/org/apache/camel/test/infra/infinispan/services/container.properties
b/test-infra/camel-test-infra-infinispan/src/main/resources/org/apache/camel/test/infra/infinispan/services/container.properties
index 732373019df2..35873f2e4f56 100644
---
a/test-infra/camel-test-infra-infinispan/src/main/resources/org/apache/camel/test/infra/infinispan/services/container.properties
+++
b/test-infra/camel-test-infra-infinispan/src/main/resources/org/apache/camel/test/infra/infinispan/services/container.properties
@@ -15,3 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
infinispan.container=quay.io/infinispan/server:16.0.1
+infinispan.container.version.exclude=dev,alpha,beta,rc
diff --git
a/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
b/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
index f617e65c95a7..51beeb8725e1 100644
---
a/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
+++
b/test-infra/camel-test-infra-kafka/src/main/resources/org/apache/camel/test/infra/kafka/services/container.properties
@@ -20,3 +20,6 @@
strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.9.1
confluent.container.image=mirror.gcr.io/confluentinc/cp-kafka:7.9.2
strimzi.container.image.version.include=latest-kafka
strimzi.container.image.version.exclude=s390x,ppc64le,arm64,amd64
+confluent.container.image.version.exclude=amd64,arm64,ppc64le,s390x,x86_64,latest,ubi
+kafka3.container.version.exclude=rc,beta,alpha
+redpanda.container.image.version.exclude=fips,amd64,arm64
diff --git
a/test-infra/camel-test-infra-microprofile-lra/src/main/resources/org/apache/camel/test/infra/microprofile/lra/services/container.properties
b/test-infra/camel-test-infra-microprofile-lra/src/main/resources/org/apache/camel/test/infra/microprofile/lra/services/container.properties
index 2fd681cea09d..a141915d6268 100644
---
a/test-infra/camel-test-infra-microprofile-lra/src/main/resources/org/apache/camel/test/infra/microprofile/lra/services/container.properties
+++
b/test-infra/camel-test-infra-microprofile-lra/src/main/resources/org/apache/camel/test/infra/microprofile/lra/services/container.properties
@@ -16,3 +16,4 @@
## ---------------------------------------------------------------------------
microprofile.lra.container=quay.io/jbosstm/lra-coordinator:5.13.1.Final-2.16.6.Final
microprofile.lra.container.ppc64le=icr.io/ppc64le-oss/quarkus/lra-coordinator-quarkus-jvm:latest
+microprofile.lra.container.ppc64le.version.exclude=latest,amd64,arm64
diff --git
a/test-infra/camel-test-infra-minio/src/main/resources/org/apache/camel/test/infra/minio/services/container.properties
b/test-infra/camel-test-infra-minio/src/main/resources/org/apache/camel/test/infra/minio/services/container.properties
index fbff1a13d3d1..c7bc42b33ebe 100644
---
a/test-infra/camel-test-infra-minio/src/main/resources/org/apache/camel/test/infra/minio/services/container.properties
+++
b/test-infra/camel-test-infra-minio/src/main/resources/org/apache/camel/test/infra/minio/services/container.properties
@@ -15,3 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
minio.container=mirror.gcr.io/minio/minio:RELEASE.2025-07-23T15-54-02Z-cpuv1
+minio.container.version.exclude=edge,latest,cicd
diff --git
a/test-infra/camel-test-infra-mongodb/src/main/resources/org/apache/camel/test/infra/mongodb/services/container.properties
b/test-infra/camel-test-infra-mongodb/src/main/resources/org/apache/camel/test/infra/mongodb/services/container.properties
index c48d54d4cd23..0890de44be4b 100644
---
a/test-infra/camel-test-infra-mongodb/src/main/resources/org/apache/camel/test/infra/mongodb/services/container.properties
+++
b/test-infra/camel-test-infra-mongodb/src/main/resources/org/apache/camel/test/infra/mongodb/services/container.properties
@@ -16,3 +16,5 @@
## ---------------------------------------------------------------------------
mongodb.container=mirror.gcr.io/mongo:7.0.12-jammy
mongodb.container.ppc64le=icr.io/ppc64le-oss/mongodb-ppc64le:4.4.24
+mongodb.container.version.include=jammy
+mongodb.container.ppc64le.version.exclude=bv
diff --git
a/test-infra/camel-test-infra-nats/src/main/resources/org/apache/camel/test/infra/nats/services/container.properties
b/test-infra/camel-test-infra-nats/src/main/resources/org/apache/camel/test/infra/nats/services/container.properties
index db20ebe4d600..2e5158931677 100644
---
a/test-infra/camel-test-infra-nats/src/main/resources/org/apache/camel/test/infra/nats/services/container.properties
+++
b/test-infra/camel-test-infra-nats/src/main/resources/org/apache/camel/test/infra/nats/services/container.properties
@@ -15,3 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
nats.container=mirror.gcr.io/nats:2.12.2
+nats.container.version.exclude=alpine,rc,beta
diff --git
a/test-infra/camel-test-infra-neo4j/src/main/resources/org/apache/camel/test/infra/neo4j/services/container.properties
b/test-infra/camel-test-infra-neo4j/src/main/resources/org/apache/camel/test/infra/neo4j/services/container.properties
index 30b4fa170c56..a665487a8556 100644
---
a/test-infra/camel-test-infra-neo4j/src/main/resources/org/apache/camel/test/infra/neo4j/services/container.properties
+++
b/test-infra/camel-test-infra-neo4j/src/main/resources/org/apache/camel/test/infra/neo4j/services/container.properties
@@ -16,3 +16,4 @@
## ---------------------------------------------------------------------------
neo4j.container=mirror.gcr.io/neo4j:5.26-community-ubi9
neo4j.container.ppc64le=icr.io/ppc64le-oss/neo4j-ppc64le:5.26.0
+neo4j.container.version.include=ubi
diff --git
a/test-infra/camel-test-infra-openldap/src/main/resources/org/apache/camel/test/infra/openldap/services/container.properties
b/test-infra/camel-test-infra-openldap/src/main/resources/org/apache/camel/test/infra/openldap/services/container.properties
index 161c475c86f6..17c38b558a6d 100644
---
a/test-infra/camel-test-infra-openldap/src/main/resources/org/apache/camel/test/infra/openldap/services/container.properties
+++
b/test-infra/camel-test-infra-openldap/src/main/resources/org/apache/camel/test/infra/openldap/services/container.properties
@@ -14,4 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-openldap.container=mirror.gcr.io/osixia/openldap:1.5.0
\ No newline at end of file
+openldap.container=mirror.gcr.io/osixia/openldap:1.5.0
+openldap.container.version.exclude=stable,latest
diff --git
a/test-infra/camel-test-infra-postgres/src/main/resources/org/apache/camel/test/infra/postgres/services/container.properties
b/test-infra/camel-test-infra-postgres/src/main/resources/org/apache/camel/test/infra/postgres/services/container.properties
index ec6c88f5ee07..c6e5d30799d4 100644
---
a/test-infra/camel-test-infra-postgres/src/main/resources/org/apache/camel/test/infra/postgres/services/container.properties
+++
b/test-infra/camel-test-infra-postgres/src/main/resources/org/apache/camel/test/infra/postgres/services/container.properties
@@ -15,3 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
postgres.container=mirror.gcr.io/postgres:17.5-alpine
+postgres.container.version.include=alpine
diff --git
a/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
b/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
index ab7c556b997a..d1bf8c9d9212 100644
---
a/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
+++
b/test-infra/camel-test-infra-rabbitmq/src/main/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties
@@ -15,3 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
rabbitmq.container=mirror.gcr.io/rabbitmq:4.1.2-management
+rabbitmq.container.version.include=management
+rabbitmq.container.version.exclude=alpine
diff --git
a/test-infra/camel-test-infra-redis/src/main/resources/org/apache/camel/test/infra/redis/services/container.properties
b/test-infra/camel-test-infra-redis/src/main/resources/org/apache/camel/test/infra/redis/services/container.properties
index 8315abd73dd1..b0453e5cb238 100644
---
a/test-infra/camel-test-infra-redis/src/main/resources/org/apache/camel/test/infra/redis/services/container.properties
+++
b/test-infra/camel-test-infra-redis/src/main/resources/org/apache/camel/test/infra/redis/services/container.properties
@@ -15,3 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
redis.container=mirror.gcr.io/redis:7.4.0-alpine
+redis.container.version.include=alpine
+redis.container.version.exclude=rc,beta
diff --git
a/test-infra/camel-test-infra-solr/src/main/resources/org/apache/camel/test/infra/solr/services/container.properties
b/test-infra/camel-test-infra-solr/src/main/resources/org/apache/camel/test/infra/solr/services/container.properties
index 3015ba24a659..6e5e681fb788 100644
---
a/test-infra/camel-test-infra-solr/src/main/resources/org/apache/camel/test/infra/solr/services/container.properties
+++
b/test-infra/camel-test-infra-solr/src/main/resources/org/apache/camel/test/infra/solr/services/container.properties
@@ -15,3 +15,4 @@
## limitations under the License.
## ---------------------------------------------------------------------------
solr.container=mirror.gcr.io/solr:9.9.0-slim
+solr.container.version.include=slim
diff --git
a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
b/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
index cd6d0fb0ff02..559c6765ef04 100644
---
a/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
+++
b/test-infra/camel-test-infra-tensorflow-serving/src/test/resources/org/apache/camel/test/infra/tensorflow/serving/services/container.properties
@@ -17,3 +17,5 @@
tensorflow.serving.container=mirror.gcr.io/tensorflow/serving:2.18.0
tensorflow.serving.container.aarch64=bitnami/tensorflow-serving:2.18.0
tensorflow.serving.container.ppc64le=ibmcom/powerai:1.6.2-tensorflow-serving-ubuntu18.04-py37-ppc64le-21.036
+tensorflow.serving.container.ppc64le.version.include=ppc64le,ubuntu
+tensorflow.serving.container.ppc64le.version.exclude=x86_64,amd64,arm64
diff --git
a/test-infra/camel-test-infra-weaviate/src/main/resources/org/apache/camel/test/infra/weaviate/services/container.properties
b/test-infra/camel-test-infra-weaviate/src/main/resources/org/apache/camel/test/infra/weaviate/services/container.properties
index f44af22486fe..a7f44a1c31b9 100644
---
a/test-infra/camel-test-infra-weaviate/src/main/resources/org/apache/camel/test/infra/weaviate/services/container.properties
+++
b/test-infra/camel-test-infra-weaviate/src/main/resources/org/apache/camel/test/infra/weaviate/services/container.properties
@@ -17,3 +17,4 @@
weaviate.container=cr.weaviate.io/semitechnologies/weaviate:1.32.0
weaviate.container.ppc64le=icr.io/ppc64le-oss/weaviate-ppc64le:1.31.1
+weaviate.container.version.exclude=preview,stable,dev,feat
diff --git
a/test-infra/camel-test-infra-zookeeper/src/main/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
b/test-infra/camel-test-infra-zookeeper/src/main/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
index a40948aa3c38..a7568f09c61f 100644
---
a/test-infra/camel-test-infra-zookeeper/src/main/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
+++
b/test-infra/camel-test-infra-zookeeper/src/main/resources/org/apache/camel/test/infra/zookeeper/services/container.properties
@@ -15,4 +15,5 @@
## limitations under the License.
## ---------------------------------------------------------------------------
zookeeper.container=mirror.gcr.io/zookeeper:3.9
-zookeeper.container.ppc64le=icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10
\ No newline at end of file
+zookeeper.container.ppc64le=icr.io/ppc64le-oss/zookeeper-ppc64le:3.5.10
+zookeeper.container.ppc64le.version.exclude=bv,debian,arm64,amd64
