improve ci & scripts

Author: zhengkezhou1

.github/workflows/ci-e2e-kafka.yml

@@ -18,12 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         jaeger-version: [v1, v2]
-        version:
-          - major: 3.x
-            distribution: kafka
-          - major: 2.x
-            distribution: kafka
-    name: ${{ matrix.version.distribution}} ${{matrix.version.major }} ${{ matrix.jaeger-version }}
+        kafka-version: ["3.x", "2.x"]
+    name: kafka ${{matrix.kafka-version }} ${{ matrix.jaeger-version }}
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
@@ -36,12 +32,12 @@ jobs:
       with:
         go-version: 1.23.x
 
-    - name: Run ${{ matrix.version.distribution }} integration tests
+    - name: Run kafka integration tests
       id: test-execution
-      run: bash scripts/kafka-integration-test.sh -j ${{ matrix.jaeger-version }} -v ${{ matrix.version.major }}
+      run: bash scripts/kafka-integration-test.sh -j ${{ matrix.jaeger-version }} -v ${{ matrix.kafka-version }}
 
     - name: Upload coverage to codecov
       uses: ./.github/actions/upload-codecov
       with:
         files: cover.out
-        flags: ${{ matrix.version.distribution }}-${{ matrix.version.major }}-${{ matrix.version.jaeger }}
+        flags: kafka-${{ matrix.kafka-version }}-${{ matrix.jaeger-version }}

docker-compose/kafka-integration-test/v2/docker-compose.yml renamed to docker-compose/kafka/v2/docker-compose.yml

@@ -5,7 +5,7 @@
 
 set -euf -o pipefail
 
-compose_file="docker-compose/kafka-integration-test/v3/docker-compose.yml"
+compose_file=""
 jaeger_version=""
 kafka_version=""
 manage_kafka="true"
@@ -15,7 +15,7 @@ usage() {
   echo "Usage: $0 [-K] -j <jaeger_version> -v <kafka_version>"
   echo "  -K: do not start or stop Kafka container (useful for local testing)"
   echo "  -j: major version of Jaeger to test (v1|v2)"
-  echo "  -v: kafka major version, e.g: 3.9"
+  echo "  -v: kafka major version (3.9|2.8)"
   exit 1
 }
 
@@ -33,7 +33,7 @@ parse_args() {
       jaeger_version=${OPTARG}
       ;;
     v)
-      kafka_version=${OPTARG}
+      kafka_version=${OPTARG%%.*}
       ;;
     K)
       manage_kafka="false"
@@ -47,7 +47,11 @@ parse_args() {
     echo "Error: Invalid Jaeger version. Valid options are v1 or v2"
     usage
   fi
-  compose_file="docker-compose/kafka-integration-test/v${kafka_version%%.*}/docker-compose.yml"
+  if [ "$kafka_version" != "3" ] && [ "$kafka_version" != "2" ]; then
+      echo "Error: Invalid kafka version. Valid options are 3.x or 2.x"
+      usage
+    fi
+  compose_file="docker-compose/kafka/v${kafka_version}/docker-compose.yml"
 }
 
 setup_kafka() {