[FLINK-36332] pass flink-versions as object

Author: SamBarker

.github/workflows/ci.yml

@@ -80,8 +80,7 @@ jobs:
     uses: ./.github/workflows/e2e.yaml
     with:
       java-version: ${{ matrix.java-version }}
-      flink-version: "v1_20"
-      flink-image: "flink:1.20"
+      flink-version: "{tag: \"v1_20", image: "flink:1.20\"}"
       http-client: ${{ matrix.http-client }}
       test: test_application_operations.sh
 

.github/workflows/e2e.yaml

@@ -9,9 +9,6 @@ on:
       flink-version:
         required: true
         type: string
-      flink-image:
-        required: true
-        type: string
       http-client:
         required: false
         type: string
@@ -30,6 +27,7 @@ on:
 
 jobs:
   e2e_test:
+    name: ${{ inputs.test }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -64,8 +62,11 @@ jobs:
           kubectl get pods -n ${{ inputs.namespace }}
       - name: Run Flink e2e tests
         run: |
-          sed -i "s/image: flink:.*/image: ${{ inputs.flink-image }}/" e2e-tests/data/*.yaml
-          sed -i "s/flinkVersion: .*/flinkVersion: ${{ inputs.flink-version }}/" e2e-tests/data/*.yaml
+          echo versions:${{ fromJSON(inputs.flink-version) }}
+          echo image:${{ fromJSON(inputs.flink-version).image }}
+          echo tag:${{ fromJSON(inputs.flink-version).tag }}
+          sed -i "s/image: flink:.*/image: ${{ fromJSON(inputs.flink-version).image }}/" e2e-tests/data/*.yaml
+          sed -i "s/flinkVersion: .*/flinkVersion: ${{ fromJSON(inputs.flink-version).tag }}/" e2e-tests/data/*.yaml
           sed -i "s/mode: .*/mode: ${{ inputs.mode }}/" e2e-tests/data/*.yaml
           git diff HEAD
           echo "Running e2e-tests/$test"