[KIP-932] Fix for green build on CI

.semaphore/run-all-tests.yml

@@ -43,7 +43,7 @@ blocks:
               value: "False"
           commands:
             - if [[ "$TEST_TYPE" != *"plaintext"* ]]; then exit 0; fi
-            - ./tests/run-all-tests.sh 
+            - ./tests/run-all-tests.sh
         - name: "SSL cluster (x86_64)"
           env_vars:
             - name: TEST_SSL

.semaphore/semaphore-integration.yml

@@ -22,7 +22,7 @@ global_job_config:
     - name: CI
       value: 'true'
     - name: KAFKA_VERSION
-      value: '4.0.0'
+      value: '4.2.0'
     - name: CP_VERSION
       value: '8.0.0'
     # Shows plain output from docker build (no progress bars)
@@ -220,7 +220,7 @@ promotions:
       env_vars:
         - required: true
           name: TEST_KAFKA_GIT_REF
-          default_value: 4.0.0
+          default_value: 4.2.0
         - required: true
           name: TEST_TYPE
           default_value: plaintext,ssl

.semaphore/semaphore.yml

@@ -22,7 +22,7 @@ global_job_config:
     - name: CI
       value: 'true'
     - name: KAFKA_VERSION
-      value: '4.0.0'
+      value: '4.2.0'
     - name: CP_VERSION
       value: '8.0.0'
     # Shows plain output from docker build (no progress bars)
@@ -139,6 +139,26 @@ blocks:
             - packaging/tools/run-in-docker.sh test-runner-amd64-${CACHE_TAG} ./packaging/tools/build-configurations-checks.sh
 
 
+  - name: 'Linux Ubuntu amd64: share consumer tests'
+    dependencies: []
+    skip:
+      when: "tag =~ '^v[0-9]\\.'"
+    task:
+      agent:
+        machine:
+          type: s1-prod-ubuntu24-04-amd64-1
+      prologue:
+        commands:
+          - '[[ -z $DOCKERHUB_APIKEY ]] || docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY'
+      jobs:
+        - name: 'Build and run share consumer tests (0170, 0171)'
+          commands:
+            - cache restore trivup-kafka-${KAFKA_VERSION}-${CACHE_TAG}
+            - packaging/tools/run-in-docker.sh test-runner-amd64-${CACHE_TAG}
+              ./packaging/tools/run-share-consumer-tests.sh
+              ${KAFKA_VERSION} ${CP_VERSION}
+            - cache store trivup-kafka-${KAFKA_VERSION}-${CACHE_TAG} tests/tmp-KafkaCluster/KafkaCluster/KafkaBrokerApp/kafka/${KAFKA_VERSION}
+
   - name: 'Linux x64: release artifact docker builds'
     dependencies: []
     run:

packaging/tools/run-share-consumer-tests.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+if [ "$#" -lt 2 ]; then
+    echo "Usage: $0 <kafka-version> <cp-version>"
+    echo "Example: $0 4.2.0 8.0.0"
+    exit 1
+fi
+
+KAFKA_VERSION=$1
+CP_VERSION=$2
+
+source /home/user/venv/bin/activate
+./configure --install-deps --enable-werror --enable-devel
+make -j all
+make -j -C tests build
+(cd tests && python3 -m trivup.clusters.KafkaCluster --kraft \
+ --version ${KAFKA_VERSION} \
+ --cpversion ${CP_VERSION} --cmd 'TESTS_SKIP_BEFORE=0170 ./run-test.sh')

src/CMakeLists.txt

@@ -72,6 +72,7 @@ set(
     rdregex.c
     rdstring.c
     rdunittest.c
+    rdunittest_fetcher.c
     rdvarint.c
     rdmap.c
     snappy.c

src/rdkafka_mock_cgrp.c

@@ -35,7 +35,6 @@
 #include "rdkafka_int.h"
 #include "rdbuf.h"
 #include "rdkafka_mock_int.h"
-#include "rdkafka_mock_group_common.h"
 
 
 static const char *rd_kafka_mock_cgrp_classic_state_names[] = {
@@ -73,9 +72,10 @@ rd_kafka_mock_cgrp_classic_set_state(rd_kafka_mock_cgrp_classic_t *mcgrp,
 void rd_kafka_mock_cgrp_classic_member_active(
     rd_kafka_mock_cgrp_classic_t *mcgrp,
     rd_kafka_mock_cgrp_classic_member_t *member) {
-        rd_kafka_mock_group_member_mark_active(mcgrp->cluster->rk, "classic",
-                                               member->id,
-                                               &member->ts_last_activity);
+        rd_kafka_dbg(mcgrp->cluster->rk, MOCK, "MOCK",
+                     "Marking mock consumer group member %s as active",
+                     member->id);
+        member->ts_last_activity = rd_clock();
 }
 
 
@@ -537,8 +537,13 @@ static void rd_kafka_mock_cgrp_classic_member_destroy(
 rd_kafka_mock_cgrp_classic_member_t *rd_kafka_mock_cgrp_classic_member_find(
     const rd_kafka_mock_cgrp_classic_t *mcgrp,
     const rd_kafkap_str_t *MemberId) {
-        return RD_KAFKA_MOCK_MEMBER_FIND(&mcgrp->members, MemberId,
-                                         rd_kafka_mock_cgrp_classic_member_t);
+        const rd_kafka_mock_cgrp_classic_member_t *member;
+        TAILQ_FOREACH(member, &mcgrp->members, link) {
+                if (!rd_kafkap_str_cmp_str(MemberId, member->id))
+                        return (rd_kafka_mock_cgrp_classic_member_t *)member;
+        }
+
+        return NULL;
 }
 
 
@@ -654,8 +659,13 @@ void rd_kafka_mock_cgrp_classic_destroy(rd_kafka_mock_cgrp_classic_t *mcgrp) {
 rd_kafka_mock_cgrp_classic_t *
 rd_kafka_mock_cgrp_classic_find(rd_kafka_mock_cluster_t *mcluster,
                                 const rd_kafkap_str_t *GroupId) {
-        return RD_KAFKA_MOCK_GROUP_FIND(&mcluster->cgrps_classic, GroupId,
-                                        rd_kafka_mock_cgrp_classic_t);
+        rd_kafka_mock_cgrp_classic_t *mcgrp;
+        TAILQ_FOREACH(mcgrp, &mcluster->cgrps_classic, link) {
+                if (!rd_kafkap_str_cmp_str(GroupId, mcgrp->id))
+                        return mcgrp;
+        }
+
+        return NULL;
 }
 
 
@@ -1325,9 +1335,10 @@ rd_kafka_mock_cgrp_consumer_member_next_assignment(
 void rd_kafka_mock_cgrp_consumer_member_active(
     rd_kafka_mock_cgrp_consumer_t *mcgrp,
     rd_kafka_mock_cgrp_consumer_member_t *member) {
-        rd_kafka_mock_group_member_mark_active(mcgrp->cluster->rk, "consumer",
-                                               member->id,
-                                               &member->ts_last_activity);
+        rd_kafka_dbg(mcgrp->cluster->rk, MOCK, "MOCK",
+                     "Marking mock consumer group member %s as active",
+                     member->id);
+        member->ts_last_activity = rd_clock();
 }
 
 /**
@@ -1342,8 +1353,13 @@ void rd_kafka_mock_cgrp_consumer_member_active(
 rd_kafka_mock_cgrp_consumer_member_t *rd_kafka_mock_cgrp_consumer_member_find(
     const rd_kafka_mock_cgrp_consumer_t *mcgrp,
     const rd_kafkap_str_t *MemberId) {
-        return RD_KAFKA_MOCK_MEMBER_FIND(&mcgrp->members, MemberId,
-                                         rd_kafka_mock_cgrp_consumer_member_t);
+        const rd_kafka_mock_cgrp_consumer_member_t *member;
+        TAILQ_FOREACH(member, &mcgrp->members, link) {
+                if (!rd_kafkap_str_cmp_str(MemberId, member->id))
+                        return (rd_kafka_mock_cgrp_consumer_member_t *)member;
+        }
+
+        return NULL;
 }
 
 /**
@@ -1684,8 +1700,13 @@ void rd_kafka_mock_cgrp_consumer_member_fenced(
 rd_kafka_mock_cgrp_consumer_t *
 rd_kafka_mock_cgrp_consumer_find(const rd_kafka_mock_cluster_t *mcluster,
                                  const rd_kafkap_str_t *GroupId) {
-        return RD_KAFKA_MOCK_GROUP_FIND(&mcluster->cgrps_consumer, GroupId,
-                                        rd_kafka_mock_cgrp_consumer_t);
+        rd_kafka_mock_cgrp_consumer_t *mcgrp;
+        TAILQ_FOREACH(mcgrp, &mcluster->cgrps_consumer, link) {
+                if (!rd_kafkap_str_cmp_str(GroupId, mcgrp->id))
+                        return mcgrp;
+        }
+
+        return NULL;
 }
 
 /**