Skip to content

Commit 1a5ee08

Browse files
SamBarkerSamBarker
authored
[FLINK-36460] Refactoring the CI matrix
1 parent 2c98292 commit 1a5ee08

File tree

2 files changed

+170
-161
lines changed

2 files changed

+170
-161
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 74 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ on:
2727
- main
2828
- release-*
2929
pull_request:
30+
concurrency:
31+
group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
32+
cancel-in-progress: true
33+
3034
jobs:
3135
test_ci:
3236
runs-on: ubuntu-latest
33-
name: test_ci
37+
name: maven build
3438
strategy:
3539
matrix:
3640
java-version: [ 11, 17, 21 ]
@@ -68,195 +72,104 @@ jobs:
6872
mvn -B verify -Dit.skip=false
6973
cd ..
7074
e2e_smoke_test:
71-
name: HTTP Client smoke test
72-
runs-on: ubuntu-latest
75+
name: Smoke test
7376
strategy:
7477
matrix:
7578
http-client: [ "okhttp", "jdk", "jetty", "vertx" ]
76-
version: ["v1_20"]
77-
mode: ["native"]
78-
namespace: ["default"]
79-
java-version: ["21"]
79+
java-version: [ "11", "17", "21" ]
80+
uses: ./.github/workflows/e2e.yaml
81+
with:
82+
java-version: ${{ matrix.java-version }}
83+
flink-version: "v1_20"
84+
http-client: ${{ matrix.http-client }}
85+
test: test_application_operations.sh
86+
e2e_namespace_tests:
87+
name: Alternative namespace tests
88+
needs: e2e_smoke_test
89+
strategy:
90+
matrix:
91+
flink-version:
92+
- "v1_20"
93+
- "v1_18"
94+
- "v1_19"
95+
- "v1_17"
96+
- "v1_16"
97+
mode:
98+
- "native"
99+
- "standalone"
80100
test:
81101
- test_application_operations.sh
82-
steps:
83-
- uses: actions/checkout@v4
84-
- name: Set up JDK ${{ matrix.java-version }}
85-
uses: actions/setup-java@v4
86-
with:
87-
java-version: ${{ matrix.java-version }}
88-
distribution: 'temurin'
89-
cache: 'maven'
90-
- name: Start minikube
91-
run: |
92-
source e2e-tests/utils.sh
93-
start_minikube
94-
- name: Install cert-manager
95-
run: |
96-
kubectl get pods -A
97-
kubectl apply -f e2e-tests/cert-manager.yaml
98-
kubectl -n cert-manager wait --all=true --for=condition=Available --timeout=300s deploy
99-
- name: Build image
100-
run: |
101-
export SHELL=/bin/bash
102-
export DOCKER_BUILDKIT=1
103-
eval $(minikube -p minikube docker-env)
104-
JAVA_VERSION=${{matrix.java-version}}
105-
HTTP_CLIENT=${{ matrix.http-client }}
106-
docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest --progress plain --build-arg JAVA_VERSION="${JAVA_VERSION:-11}" --build-arg HTTP_CLIENT="${HTTP_CLIENT:-okhttp}" .
107-
docker images
108-
- name: Start the operator
109-
run: |
110-
if [[ "${{ matrix.test }}" == "test_flink_operator_ha.sh" ]]; then
111-
sed -i "s/# kubernetes.operator.leader-election.enabled: false/kubernetes.operator.leader-election.enabled: true/" helm/flink-kubernetes-operator/conf/flink-conf.yaml
112-
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
113-
sed -i "s/replicas: 1/replicas: 2/" helm/flink-kubernetes-operator/values.yaml
114-
fi
115-
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 }}
116-
kubectl wait --for=condition=Available --timeout=120s -n ${{ matrix.namespace }} deploy/flink-kubernetes-operator
117-
kubectl get pods -n ${{ matrix.namespace }}
118-
- name: Run Flink e2e tests
119-
run: |
120-
sed -i "s/image: flink:.*/image: ${{ matrix.image }}/" e2e-tests/data/*.yaml
121-
sed -i "s/flinkVersion: .*/flinkVersion: ${{ matrix.version }}/" e2e-tests/data/*.yaml
122-
sed -i "s/mode: .*/mode: ${{ matrix.mode }}/" e2e-tests/data/*.yaml
123-
git diff HEAD
124-
echo "Running e2e-tests/$test"
125-
bash e2e-tests/${{ matrix.test }} || exit 1
126-
git reset --hard
127-
- name: Stop the operator
128-
run: |
129-
helm uninstall -n ${{ matrix.namespace }} flink-kubernetes-operator
130-
- name: Stop minikube
131-
run: |
132-
source e2e-tests/utils.sh
133-
stop_minikube
102+
- test_multi_sessionjob.sh
103+
- test_autoscaler.sh
104+
- test_dynamic_config.sh
105+
exclude:
106+
- mode: standalone
107+
test: test_autoscaler.sh
108+
- mode: standalone
109+
test: test_dynamic_config.sh
110+
- flink-version: v1_16
111+
test: test_autoscaler.sh
112+
- flink-version: v1_16
113+
test: test_dynamic_config.sh
114+
115+
uses: ./.github/workflows/e2e.yaml
116+
with:
117+
java-version: 11
118+
flink-version: ${{ matrix.flink-version }}
119+
test: ${{ matrix.test }}
120+
namespace: "flink"
121+
create-namespace: true
122+
mode: ${{ matrix.mode }}
134123
e2e_ci:
135124
needs: e2e_smoke_test
136-
runs-on: ubuntu-latest
137125
strategy:
138126
matrix:
139-
version: ["v1_20","v1_19","v1_18","v1_17","v1_16"]
140-
namespace: ["default","flink"]
141-
mode: ["native", "standalone"]
142-
java-version: [ 11, 17, 21 ]
127+
flink-version:
128+
- "v1_20"
129+
- "v1_18"
130+
- "v1_19"
131+
- "v1_17"
132+
- "v1_16"
133+
mode:
134+
- "native"
135+
- "standalone"
143136
test:
144137
- test_application_kubernetes_ha.sh
145138
- test_application_operations.sh
146139
- test_dynamic_config.sh
147140
- test_sessionjob_kubernetes_ha.sh
148141
- test_sessionjob_operations.sh
149-
- test_multi_sessionjob.sh
150142
- test_autoscaler.sh
151143
- test_flink_operator_ha.sh
152144
- test_snapshot.sh
153-
include:
154-
- namespace: flink
155-
extraArgs: '--create-namespace --set "watchNamespaces={default,flink}"'
156-
- version: v1_20
157-
image: flink:1.20
158-
- version: v1_19
159-
image: flink:1.19
160-
- version: v1_18
161-
image: flink:1.18
162-
- version: v1_17
163-
image: flink:1.17
164-
- version: v1_16
165-
image: flink:1.16
166145
exclude:
167-
- namespace: default
168-
test: test_multi_sessionjob.sh
169-
- namespace: default
170-
test: test_autoscaler.sh
171-
- namespace: default
172-
test: test_dynamic_config.sh
173-
- mode: standalone
146+
- flink-version: v1_16
174147
test: test_autoscaler.sh
175148
- mode: standalone
176-
test: test_dynamic_config.sh
177-
- mode: standalone
178-
test: test_snapshot.sh
179-
- version: v1_16
180149
test: test_autoscaler.sh
181-
- version: v1_16
150+
- flink-version: v1_16
182151
test: test_dynamic_config.sh
183-
- version: v1_16
152+
- flink-version: v1_16
184153
test: test_flink_operator_ha.sh
185-
- version: v1_16
154+
- flink-version: v1_16
186155
test: test_snapshot.sh
187-
- version: v1_17
156+
- flink-version: v1_17
188157
test: test_dynamic_config.sh
189-
- version: v1_17
158+
- flink-version: v1_17
190159
test: test_flink_operator_ha.sh
191-
- version: v1_17
160+
- flink-version: v1_17
192161
test: test_snapshot.sh
193-
- version: v1_18
162+
- flink-version: v1_18
194163
test: test_dynamic_config.sh
195-
- version: v1_18
164+
- flink-version: v1_18
196165
test: test_flink_operator_ha.sh
197-
- version: v1_18
166+
- flink-version: v1_18
198167
test: test_snapshot.sh
199-
- version: v1_19
168+
- flink-version: v1_19
200169
test: test_snapshot.sh
201-
- version: v1_16
202-
java-version: 17
203-
- version: v1_17
204-
java-version: 17
205-
- version: v1_16
206-
java-version: 21
207-
- version: v1_17
208-
java-version: 21
209-
- version: v1_18
210-
java-version: 21
211-
name: e2e_ci
212-
steps:
213-
- uses: actions/checkout@v4
214-
- name: Set up JDK ${{ matrix.java-version }}
215-
uses: actions/setup-java@v4
216-
with:
217-
java-version: ${{ matrix.java-version }}
218-
distribution: 'temurin'
219-
cache: 'maven'
220-
- name: Start minikube
221-
run: |
222-
source e2e-tests/utils.sh
223-
start_minikube
224-
- name: Install cert-manager
225-
run: |
226-
kubectl get pods -A
227-
kubectl apply -f e2e-tests/cert-manager.yaml
228-
kubectl -n cert-manager wait --all=true --for=condition=Available --timeout=300s deploy
229-
- name: Build image
230-
run: |
231-
export SHELL=/bin/bash
232-
export DOCKER_BUILDKIT=1
233-
eval $(minikube -p minikube docker-env)
234-
JAVA_VERSION=${{ matrix.java-version }}
235-
docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest --progress plain --build-arg JAVA_VERSION="${JAVA_VERSION:-11}" .
236-
docker images
237-
- name: Start the operator
238-
run: |
239-
if [[ "${{ matrix.test }}" == "test_flink_operator_ha.sh" ]]; then
240-
sed -i "s/# kubernetes.operator.leader-election.enabled: false/kubernetes.operator.leader-election.enabled: true/" helm/flink-kubernetes-operator/conf/flink-conf.yaml
241-
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
242-
sed -i "s/replicas: 1/replicas: 2/" helm/flink-kubernetes-operator/values.yaml
243-
fi
244-
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 }}
245-
kubectl wait --for=condition=Available --timeout=120s -n ${{ matrix.namespace }} deploy/flink-kubernetes-operator
246-
kubectl get pods -n ${{ matrix.namespace }}
247-
- name: Run Flink e2e tests
248-
run: |
249-
sed -i "s/image: flink:.*/image: ${{ matrix.image }}/" e2e-tests/data/*.yaml
250-
sed -i "s/flinkVersion: .*/flinkVersion: ${{ matrix.version }}/" e2e-tests/data/*.yaml
251-
sed -i "s/mode: .*/mode: ${{ matrix.mode }}/" e2e-tests/data/*.yaml
252-
git diff HEAD
253-
echo "Running e2e-tests/$test"
254-
bash e2e-tests/${{ matrix.test }} || exit 1
255-
git reset --hard
256-
- name: Stop the operator
257-
run: |
258-
helm uninstall -n ${{ matrix.namespace }} flink-kubernetes-operator
259-
- name: Stop minikube
260-
run: |
261-
source e2e-tests/utils.sh
262-
stop_minikube
170+
uses: ./.github/workflows/e2e.yaml
171+
with:
172+
java-version: 11
173+
flink-version: ${{ matrix.flink-version }}
174+
test: ${{ matrix.test }}
175+
mode: ${{ matrix.mode }}

‎.github/workflows/e2e.yaml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
name: E2E test workflow
2+
3+
on:
4+
workflow_call:
5+
inputs:
6+
java-version:
7+
required: true
8+
type: string
9+
flink-version:
10+
required: true
11+
type: string
12+
http-client:
13+
required: false
14+
type: string
15+
default: "okhttp"
16+
namespace:
17+
required: false
18+
type: string
19+
default: "default"
20+
mode:
21+
required: false
22+
type: string
23+
default: "native"
24+
test:
25+
required: true
26+
type: string
27+
create-namespace:
28+
type: boolean
29+
default: false
30+
31+
jobs:
32+
e2e_test:
33+
name: ${{ inputs.test }}
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v4
37+
- name: Set up JDK ${{ inputs.java-version }}
38+
uses: actions/setup-java@v4
39+
with:
40+
java-version: ${{ inputs.java-version }}
41+
distribution: 'temurin'
42+
cache: 'maven'
43+
- name: Start minikube
44+
run: |
45+
source e2e-tests/utils.sh
46+
start_minikube
47+
- name: Install cert-manager
48+
run: |
49+
kubectl get pods -A
50+
kubectl apply -f e2e-tests/cert-manager.yaml
51+
kubectl -n cert-manager wait --all=true --for=condition=Available --timeout=300s deploy
52+
- name: Build image
53+
run: |
54+
export SHELL=/bin/bash
55+
export DOCKER_BUILDKIT=1
56+
eval $(minikube -p minikube docker-env)
57+
JAVA_VERSION=${{ inputs.java-version }}
58+
HTTP_CLIENT=${{ inputs.http-client }}
59+
docker build --progress=plain --no-cache -f ./Dockerfile -t flink-kubernetes-operator:ci-latest --progress plain --build-arg JAVA_VERSION="${JAVA_VERSION:-11}" --build-arg HTTP_CLIENT="${HTTP_CLIENT:-okhttp}" .
60+
docker images
61+
- name: Create ${{ inputs.namespace }} == ${{ inputs.create-namespace }}
62+
id: namespace-creator
63+
if: ${{ inputs.create-namespace }}
64+
run: |
65+
source e2e-tests/utils.sh
66+
create_namespace ${{ inputs.namespace }}
67+
echo 'EXTRA_HELM_INSTALL_ARGS=--set "watchNamespaces={default,flink}"' >> $GITHUB_OUTPUT
68+
- name: Start the operator
69+
run: |
70+
if [[ "${{ inputs.test }}" == "test_flink_operator_ha.sh" ]]; then
71+
sed -i "s/# kubernetes.operator.leader-election.enabled: false/kubernetes.operator.leader-election.enabled: true/" helm/flink-kubernetes-operator/conf/flink-conf.yaml
72+
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
73+
sed -i "s/replicas: 1/replicas: 2/" helm/flink-kubernetes-operator/values.yaml
74+
fi
75+
helm --debug install flink-kubernetes-operator -n ${{ inputs.namespace }} helm/flink-kubernetes-operator --set image.repository=flink-kubernetes-operator --set image.tag=ci-latest ${{ steps.namespace-creator.outputs.EXTRA_HELM_INSTALL_ARGS }}
76+
kubectl wait --for=condition=Available --timeout=120s -n ${{ inputs.namespace }} deploy/flink-kubernetes-operator
77+
kubectl get pods -n ${{ inputs.namespace }}
78+
- name: Run Flink e2e tests
79+
run: |
80+
FLINK_IMAGE=$(sed --regexp-extended 's/v([0-9]+)_([0-9]+)/flink:\1.\2/g' <<< ${{ inputs.flink-version }} )
81+
echo FLINK_IMAGE=${FLINK_IMAGE}
82+
sed -i "s/image: flink:.*/image: ${FLINK_IMAGE}/" e2e-tests/data/*.yaml
83+
sed -i "s/flinkVersion: .*/flinkVersion: ${{ inputs.flink-version }}/" e2e-tests/data/*.yaml
84+
sed -i "s/mode: .*/mode: ${{ inputs.mode }}/" e2e-tests/data/*.yaml
85+
git diff HEAD
86+
echo "Running e2e-tests/$test"
87+
bash e2e-tests/${{ inputs.test }} || exit 1
88+
git reset --hard
89+
- name: Stop the operator
90+
run: |
91+
helm uninstall -n ${{ inputs.namespace }} flink-kubernetes-operator
92+
- name: Stop minikube
93+
run: |
94+
source e2e-tests/utils.sh
95+
stop_minikube
96+

0 commit comments

Comments
 (0)