diff --git a/.github/workflows/e2e-docker-release.yml b/.github/workflows/e2e-docker-release.yml new file mode 100644 index 0000000000..8830d7b985 --- /dev/null +++ b/.github/workflows/e2e-docker-release.yml @@ -0,0 +1,41 @@ +name: E2E Docker Release + +on: + workflow_dispatch: + +jobs: + docker-release: + name: Docker Image Release + strategy: + matrix: + platform: [ "ubuntu-22.04" ] + jdk: ["17"] + runs-on: ${{ matrix.platform }} + permissions: + contents: write + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Determine Image Tags + id: image_tags + run: | + TAG=$(grep default_jdk tests/docker/ducker-ak | grep kos_e2e_base | awk -F ':|"' '{print $3}') + echo "tags=${{ secrets.DOCKERHUB_USERNAME }}/kos_e2e_base:$TAG" >> $GITHUB_OUTPUT + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_READ_WRITE_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v5 + with: + file: ./tests/docker/base-Dockerfile + push: true + tags: ${{ steps.image_tags.outputs.tags }} + platforms: linux/amd64,linux/arm64 diff --git a/tests/docker/base-Dockerfile b/tests/docker/base-Dockerfile index cf98aa0a19..98b5055e18 100644 --- a/tests/docker/base-Dockerfile +++ b/tests/docker/base-Dockerfile @@ -44,6 +44,6 @@ RUN mkdir -p "/opt/kafka-3.2.3" && chmod a+rw /opt/kafka-3.2.3 && curl -s "$KAFK RUN mkdir -p "/opt/kafka-3.3.2" && chmod a+rw /opt/kafka-3.3.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.3.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.3.2" RUN mkdir -p "/opt/kafka-3.4.1" && chmod a+rw /opt/kafka-3.4.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.4.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.4.1" RUN mkdir -p "/opt/kafka-3.5.2" && chmod a+rw /opt/kafka-3.5.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.5.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.5.2" -RUN mkdir -p "/opt/kafka-3.6.1" && chmod a+rw /opt/kafka-3.6.1 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.6.1.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.6.1" +RUN mkdir -p "/opt/kafka-3.6.2" && chmod a+rw /opt/kafka-3.6.2 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.6.2.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.6.2" RUN mkdir -p "/opt/kafka-3.7.0" && chmod a+rw /opt/kafka-3.7.0 && curl -s "$KAFKA_MIRROR/kafka_2.12-3.7.0.tgz" | tar xz --strip-components=1 -C "/opt/kafka-3.7.0" diff --git a/tests/docker/ducker-ak b/tests/docker/ducker-ak index c7829ae749..2a72416d1b 100755 --- a/tests/docker/ducker-ak +++ b/tests/docker/ducker-ak @@ -45,7 +45,7 @@ docker_run_memory_limit="3000m" default_num_nodes=14 # The default OpenJDK base image. -default_jdk="automqinc/kos_e2e_base:3.7.0" +default_jdk="automqinc/kos_e2e_base:3.8.0" # The default ducker-ak image name. default_image_name="ducker-ak-kos" diff --git a/tests/docker/run_tests.sh b/tests/docker/run_tests.sh index 05f25c2579..c2692f79fd 100755 --- a/tests/docker/run_tests.sh +++ b/tests/docker/run_tests.sh @@ -19,7 +19,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" KAFKA_NUM_CONTAINERS=${KAFKA_NUM_CONTAINERS:-14} TC_PATHS=${TC_PATHS:-${ESK_TEST_YML:-./kafkatest/}} TC_GENERAL_MIRROR_URL=${TC_GENERAL_MIRROR_URL:-""} -TC_BASE_IMAGE=${TC_BASE_IMAGE:-"automqinc/kos_e2e_base:3.7.0"} +TC_BASE_IMAGE=${TC_BASE_IMAGE:-"automqinc/kos_e2e_base:3.8.0"} REBUILD=${REBUILD:f} DUCKER_TEST_OPTIONS=${DUCKER_TEST_OPTIONS:-""} diff --git a/tests/kafkatest/tests/client/consumer_rolling_upgrade_test.py b/tests/kafkatest/tests/client/consumer_rolling_upgrade_test.py index 9f1db343a7..8e9560bcb1 100644 --- a/tests/kafkatest/tests/client/consumer_rolling_upgrade_test.py +++ b/tests/kafkatest/tests/client/consumer_rolling_upgrade_test.py @@ -56,11 +56,6 @@ def _verify_roundrobin_assignment(self, consumer): metadata_quorum=[quorum.isolated_kraft], use_new_coordinator=[True, False] ) - @matrix( - metadata_quorum=quorum.all_kraft, - use_new_coordinator=[True], - group_protocol=consumer_group.all_group_protocols - ) def rolling_update_test(self, metadata_quorum=quorum.zk, use_new_coordinator=False, group_protocol=None): """ Verify rolling updates of partition assignment strategies works correctly. In this