From 071042ccde77af6e1d45fd06ff1bfcb5912352eb Mon Sep 17 00:00:00 2001
From: Sam Barker <sbarker@redhat.com>
Date: Thu, 26 Sep 2024 10:15:52 +1200
Subject: [PATCH] [FLINK-36332] Narrow down the matrix for httpclient testing.

---
 .github/workflows/ci.yml | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 09045c961..874630a0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,7 +78,7 @@ jobs:
         namespace: ["default","flink"]
         mode: ["native", "standalone"]
         java-version: [ 11, 17, 21 ]
-        http-client: [ "okhttp", "vertx", "jetty",  "jdk" ]
+        http-client: [ "okhttp" ]
         test:
           - test_application_kubernetes_ha.sh
           - test_application_operations.sh
@@ -102,6 +102,34 @@ jobs:
             image: flink:1.17
           - version: v1_16
             image: flink:1.16
+          - version: v1_20
+            # Version isn't critical but should ideally be latest.
+            mode: "native"
+            namespace: "default"
+            test: test_application_operations.sh
+            http-client: "okhttp"
+            java-version: 21
+          - version: v1_20
+            # Version isn't critical but should ideally be latest.
+            mode: "native"
+            namespace: "default"
+            test: test_application_operations.sh
+            http-client: "vertx"
+            java-version: 21
+          - version: v1_20
+            # Version isn't critical but should ideally be latest.
+            mode: "native"
+            namespace: "default"
+            test: test_application_operations.sh
+            http-client: "jetty"
+            java-version: 21
+          - version: v1_20
+            # Version isn't critical but should ideally be latest.
+            mode: "native"
+            namespace: "default"
+            test: test_application_operations.sh
+            http-client: "jdk"
+            java-version: 21
         exclude:
           - namespace: default
             test: test_multi_sessionjob.sh
@@ -176,7 +204,8 @@ jobs:
           export SHELL=/bin/bash
           export DOCKER_BUILDKIT=1
           eval $(minikube -p minikube docker-env)
-          docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-${{ matrix.http-client }}-latest --progress plain --build-arg HTTP_CLIENT=${{ matrix.http-client }} .
+          HTTP_CLIENT=${{ matrix.http-client }}
+          docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-${{ matrix.http-client }}-latest --progress plain --build-arg HTTP_CLIENT="${HTTP_CLIENT:-okhttp}" .
           docker images
       - name: Start the operator
         run: |
@@ -185,7 +214,7 @@ jobs:
             sed -i "s/# kubernetes.operator.leader-election.lease-name: flink-operator-lease/kubernetes.operator.leader-election.lease-name: flink-operator-lease/" helm/flink-kubernetes-operator/conf/flink-conf.yaml
             sed -i "s/replicas: 1/replicas: 2/" helm/flink-kubernetes-operator/values.yaml
           fi
-          helm --debug install flink-kubernetes-operator -n ${{ matrix.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest ${{ matrix.extraArgs }}
+          helm --debug install flink-kubernetes-operator -n ${{ matrix.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-${{ matrix.http-client }}-latest ${{ matrix.extraArgs }}
           kubectl wait --for=condition=Available --timeout=120s -n ${{ matrix.namespace }} deploy/flink-kubernetes-operator
           kubectl get pods -n ${{ matrix.namespace }}
       - name: Run Flink e2e tests