Skip to content

Commit 18e5824

Browse files
authored
fix: GH actions revert to use less Minikube downloads (#2713)
Signed-off-by: xstefank <[email protected]>
1 parent 9057d5f commit 18e5824

File tree

3 files changed

+13
-78
lines changed

3 files changed

+13
-78
lines changed

.github/workflows/build.yml

+6-54
Original file line numberDiff line numberDiff line change
@@ -5,69 +5,31 @@ env:
55

66
on:
77
workflow_call:
8-
inputs:
9-
kube-version:
10-
type: string
11-
required: true
128

139
jobs:
14-
set_up_kubernetes:
15-
name: Set up Kubernetes ${{ inputs.kube-version }}
16-
runs-on: ubuntu-latest
17-
steps:
18-
- uses: actions/checkout@v4
19-
20-
- name: Set up Minikube
21-
uses: manusa/[email protected]
22-
with:
23-
minikube version: 'v1.34.0'
24-
kubernetes version: '${{ inputs.kube-version }}'
25-
driver: 'docker'
26-
github token: ${{ secrets.GITHUB_TOKEN }}
27-
28-
- name: Save minikube directory
29-
id: minikube
30-
run: |
31-
echo "minikube-dir=$MINIKUBE_HOME" >> $GITHUB_OUTPUT
32-
33-
- name: Upload minikube
34-
uses: actions/upload-artifact@v4
35-
with:
36-
name: minikube-${{ inputs.kube-version }}
37-
path: ${{ steps.minikube.outputs.minikube-dir }}
38-
include-hidden-files: true
39-
4010
integration_tests:
41-
name: "JDK: ${{ matrix.java }}, IT category: ${{ matrix.it-category }}"
42-
needs: set_up_kubernetes
4311
strategy:
4412
matrix:
4513
java: [ 17, 21 ]
46-
it-category: [ 'baseapi', 'dependent', 'workflow' ]
14+
kubernetes: [ 'v1.29.12','1.30.8', '1.31.4', '1.32.0' ]
4715
uses: ./.github/workflows/integration-tests.yml
4816
with:
49-
kube-version: ${{ inputs.kube-version }}
5017
java-version: ${{ matrix.java }}
51-
it-category: ${{ matrix.it-category }}
18+
kube-version: ${{ matrix.kubernetes }}
5219

53-
http_client_tests:
54-
name: "JDK: ${{ matrix.java }}, IT category: ${{ matrix.it-category }}, HTTP client: ${{ matrix.httpclient }}"
55-
needs: set_up_kubernetes
20+
httpclient-tests:
5621
strategy:
5722
matrix:
58-
java: [ 17, 21 ]
59-
it-category: [ 'baseapi' ]
6023
httpclient: [ 'vertx', 'jdk', 'jetty' ]
6124
uses: ./.github/workflows/integration-tests.yml
6225
with:
63-
kube-version: ${{ inputs.kube-version }}
64-
java-version: ${{ matrix.java }}
65-
it-category: ${{ matrix.it-category }}
26+
java-version: 21
27+
kube-version: '1.32.0'
6628
http-client: ${{ matrix.httpclient }}
29+
experimental: true
6730

6831
special_integration_tests:
6932
name: "Special integration tests (${{ matrix.java }})"
70-
needs: set_up_kubernetes
7133
runs-on: ubuntu-latest
7234
strategy:
7335
matrix:
@@ -81,13 +43,3 @@ jobs:
8143
java-version: ${{ matrix.java }}
8244
- name: Run Special Integration Tests
8345
run: ./mvnw ${MAVEN_ARGS} -B package -P minimal-watch-timeout-dependent-it --file pom.xml
84-
85-
delete_kubernetes:
86-
needs: [ integration_tests, http_client_tests, special_integration_tests ]
87-
if: always()
88-
name: Delete Kubernetes ${{ inputs.kube-version }} artifact
89-
runs-on: ubuntu-latest
90-
steps:
91-
- uses: geekyeggo/delete-artifact@v5
92-
with:
93-
name: minikube-${{ inputs.kube-version }}

.github/workflows/integration-tests.yml

+7-18
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,14 @@ on:
2121
type: string
2222
required: false
2323
default: ''
24-
it-category:
25-
type: string
26-
required: false
27-
default: ''
2824

2925
jobs:
3026
integration_tests:
31-
name: "Experimental: ${{ inputs.experimental }}, Checkout ref: ${{ inputs.checkout-ref }}"
27+
name: Integration tests (${{ inputs.java-version }}, ${{ inputs.kube-version }}, ${{ inputs.http-client }})
3228
runs-on: ubuntu-latest
3329
continue-on-error: ${{ inputs.experimental }}
3430
timeout-minutes: 40
3531
steps:
36-
- name: Output test information
37-
run: echo "Running ITs with ${{ inputs.http-client }}, ${{ inputs.kube-version }}, ${{ inputs.java-version }}"
3832
- uses: actions/checkout@v4
3933
with:
4034
ref: ${{ inputs.checkout-ref }}
@@ -44,18 +38,13 @@ jobs:
4438
distribution: temurin
4539
java-version: ${{ inputs.java-version }}
4640
cache: 'maven'
47-
- name: Download minikube artifact for Kubernetes ${{ inputs.kube-version }}
48-
uses: actions/download-artifact@v4
41+
- name: Set up Minikube
42+
uses: manusa/[email protected]
4943
with:
50-
name: minikube-${{inputs.kube-version}}
51-
path: minikube
52-
- name: Start minikube with Kubernetes ${{ inputs.kube-version }}
53-
run: |
54-
# wait for docker
55-
docker version -f '{{.Server.Version}} - {{.Client.Version}}'
56-
export MINIKUBE_HOME=$PWD/minikube
57-
minikube start --driver=docker
58-
kubectl version
44+
minikube version: 'v1.34.0'
45+
kubernetes version: '${{ inputs.kube-version }}'
46+
driver: 'docker'
47+
github token: ${{ secrets.GITHUB_TOKEN }}
5948
- name: "${{inputs.it-category}} integration tests (kube: ${{ inputs.kube-version }} / java: ${{ inputs.java-version }} / client: ${{ inputs.http-client }})"
6049
run: |
6150
if [ -z "${{inputs.it-category}}" ]; then

.github/workflows/pr.yml

-6
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,4 @@ jobs:
3131
run: ./mvnw ${MAVEN_ARGS} clean install -Pno-apt --file pom.xml
3232

3333
build:
34-
name: Integration tests with Kubernetes ${{ matrix.kubernetes }}
35-
strategy:
36-
matrix:
37-
kubernetes: [ 'v1.29.12','1.30.8', '1.31.4', '1.32.0' ]
3834
uses: ./.github/workflows/build.yml
39-
with:
40-
kube-version: ${{ matrix.kubernetes }}

0 commit comments

Comments
 (0)