Skip to content

Commit 9ca50a4

Browse files
committed
Group GA builds by -pull, -push and -release
1 parent 8ce3700 commit 9ca50a4

9 files changed

+137
-222
lines changed

Diff for: .github/workflows/gitserver-build-pull.yaml

-19
This file was deleted.

Diff for: .github/workflows/integration-tests-pull.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
make -C components/operator deploy
2626
make -C tests/operator test
2727
env:
28-
IMG: europe-docker.pkg.dev/kyma-project/dev/serverless-operator/ga:PR-${{ github.event.number }}
28+
IMG: europe-docker.pkg.dev/kyma-project/dev/serverless-operator:PR-${{ github.event.number }}
2929
- if: ${{ always() }}
3030
uses: ./.github/actions/collect-cluster-info
3131

@@ -43,4 +43,4 @@ jobs:
4343
make -C tests/serverless serverless-integration serverless-contract-tests
4444
make remove-serverless
4545
env:
46-
IMG: europe-docker.pkg.dev/kyma-project/dev/serverless-operator/ga:PR-${{ github.event.number }}
46+
IMG: europe-docker.pkg.dev/kyma-project/dev/serverless-operator:PR-${{ github.event.number }}

Diff for: .github/workflows/serverless-build-pull.yaml

+54-9
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,68 @@ permissions:
99
contents: read # This is required for actions/checkout
1010

1111
jobs:
12-
build-image-serverless-controller:
12+
build-operator:
1313
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
1414
with:
15-
name: function-controller/ga
15+
name: serverless-operator
16+
dockerfile: components/operator/Dockerfile
17+
18+
build-gitserver:
19+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
20+
with:
21+
name: gitserver
22+
dockerfile: Dockerfile
23+
context: tests/gitserver
24+
25+
build-serverless-controller:
26+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
27+
with:
28+
name: function-controller
1629
dockerfile: components/serverless/deploy/manager/Dockerfile
17-
context: .
1830

19-
build-image-serverless-webhook:
31+
build-serverless-webhook:
2032
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
2133
with:
22-
name: function-webhook/ga
34+
name: function-webhook
2335
dockerfile: components/serverless/deploy/webhook/Dockerfile
24-
context: .
2536

26-
build-image-serverless-jobinit:
37+
build-serverless-jobinit:
2738
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
2839
with:
29-
name: function-build-init/ga
40+
name: function-build-init
3041
dockerfile: components/serverless/deploy/jobinit/Dockerfile
31-
context: .
42+
43+
build-nodejs18:
44+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
45+
with:
46+
name: function-runtime-nodejs18
47+
dockerfile: nodejs18/Dockerfile
48+
context: components/runtimes/nodejs
49+
50+
build-nodejs20:
51+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
52+
with:
53+
name: function-runtime-nodejs20
54+
dockerfile: nodejs20/Dockerfile
55+
context: components/runtimes/nodejs
56+
57+
build-python39:
58+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
59+
with:
60+
name: function-runtime-python39
61+
dockerfile: python39/Dockerfile
62+
context: components/runtimes/python
63+
64+
build-python312:
65+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
66+
with:
67+
name: function-runtime-python312
68+
dockerfile: python312/Dockerfile
69+
context: components/runtimes/python
70+
71+
build-java17:
72+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
73+
with:
74+
name: function-runtime-java17-jvm-alpha
75+
dockerfile: Dockerfile-jvm-runtime
76+
context: components/runtimes/java17

Diff for: .github/workflows/serverless-build-push.yaml

+61-8
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
- 'examples/**'
99

1010
permissions:
11-
id-token: write
12-
contents: read
11+
id-token: write # This is required for requesting the JWT token
12+
contents: read # This is required for actions/checkout
1313

1414
jobs:
1515
compute-tag:
@@ -23,26 +23,79 @@ jobs:
2323
id: get_tag
2424
run: echo ::set-output name=TAG::${{ github.sha }}
2525

26-
build-image-serverless-controller:
26+
build-operator:
27+
needs: compute-tag
28+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main
29+
with:
30+
name: serverless-operator
31+
dockerfile: components/operator/Dockerfile
32+
tags: ${{ needs.compute-tag.outputs.tag }}
33+
34+
build-serverless-controller:
2735
needs: compute-tag
2836
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
2937
with:
30-
name: function-controller/ga
38+
name: function-controller
3139
dockerfile: components/serverless/deploy/manager/Dockerfile
3240
tags: ${{ needs.compute-tag.outputs.tag }}
3341

34-
build-image-serverless-webhook:
42+
build-serverless-webhook:
3543
needs: compute-tag
3644
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
3745
with:
38-
name: function-webhook/ga
46+
name: function-webhook
3947
dockerfile: components/serverless/deploy/webhook/Dockerfile
4048
tags: ${{ needs.compute-tag.outputs.tag }}
4149

42-
build-image-serverless-jobinit:
50+
build-serverless-jobinit:
4351
needs: compute-tag
4452
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
4553
with:
46-
name: function-build-init/ga
54+
name: function-build-init
4755
dockerfile: components/serverless/deploy/jobinit/Dockerfile
4856
tags: ${{ needs.compute-tag.outputs.tag }}
57+
58+
build-nodejs18:
59+
needs: compute-tag
60+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
61+
with:
62+
name: function-runtime-nodejs18
63+
dockerfile: nodejs18/Dockerfile
64+
context: components/runtimes/nodejs
65+
tags: ${{ needs.compute-tag.outputs.tag }}
66+
67+
build-nodejs20:
68+
needs: compute-tag
69+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
70+
with:
71+
name: function-runtime-nodejs20
72+
dockerfile: nodejs20/Dockerfile
73+
context: components/runtimes/nodejs
74+
tags: ${{ needs.compute-tag.outputs.tag }}
75+
76+
build-python39:
77+
needs: compute-tag
78+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
79+
with:
80+
name: function-runtime-python39
81+
dockerfile: python39/Dockerfile
82+
context: components/runtimes/python
83+
tags: ${{ needs.compute-tag.outputs.tag }}
84+
85+
build-python312:
86+
needs: compute-tag
87+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
88+
with:
89+
name: function-runtime-python312
90+
dockerfile: python312/Dockerfile
91+
context: components/runtimes/python
92+
tags: ${{ needs.compute-tag.outputs.tag }}
93+
94+
build-java17:
95+
needs: compute-tag
96+
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
97+
with:
98+
name: function-runtime-java17-jvm-alpha
99+
dockerfile: Dockerfile-jvm-runtime
100+
context: components/runtimes/java17
101+
tags: ${{ needs.compute-tag.outputs.tag }}

Diff for: .github/workflows/release-serverless-build.yaml renamed to .github/workflows/serverless-build-release.yaml

+20-20
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ on:
44
tags:
55
- '^v?\d+\.\d+\.\d+(?:-.*)?$'
66
permissions:
7-
id-token: write
8-
contents: read
7+
id-token: write # This is required for requesting the JWT token
8+
contents: read # This is required for actions/checkout
99

1010
jobs:
1111
compute-tag:
@@ -19,80 +19,80 @@ jobs:
1919
id: get_tag
2020
run: echo ::set-output name=TAG::${{ github.sha }}
2121

22-
build-release-serverless-operator:
22+
build-operator:
2323
needs: compute-tag
2424
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
2525
with:
26-
name: serverless-operator/ga
26+
name: serverless-operator
2727
dockerfile: components/operator/Dockerfile
2828
build-arg: PURPOSE=release
2929
tags: ${{ needs.compute-tag.outputs.tag }}
3030

31-
build-release-serverless-controller:
31+
build-serverless-controller:
3232
needs: compute-tag
3333
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
3434
with:
35-
name: function-controller/ga
35+
name: function-controller
3636
dockerfile: components/serverless/deploy/manager/Dockerfile
3737
tags: ${{ needs.compute-tag.outputs.tag }}
3838

39-
build-release-serverless-webhook:
39+
build-serverless-webhook:
4040
needs: compute-tag
4141
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
4242
with:
43-
name: function-webhook/ga
43+
name: function-webhook
4444
dockerfile: components/serverless/deploy/webhook/Dockerfile
4545
tags: ${{ needs.compute-tag.outputs.tag }}
4646

47-
build-release-serverless-jobinit:
47+
build-serverless-jobinit:
4848
needs: compute-tag
4949
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
5050
with:
51-
name: function-build-init/ga
51+
name: function-build-init
5252
dockerfile: components/serverless/deploy/jobinit/Dockerfile
5353
tags: ${{ needs.compute-tag.outputs.tag }}
5454

55-
build-release-image-nodejs18:
55+
build-nodejs18:
5656
needs: compute-tag
5757
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
5858
with:
59-
name: function-runtime-nodejs18/ga
59+
name: function-runtime-nodejs18
6060
dockerfile: nodejs18/Dockerfile
6161
context: components/runtimes/nodejs
6262
tags: ${{ needs.compute-tag.outputs.tag }}
6363

64-
build-release-image-nodejs20:
64+
build-nodejs20:
6565
needs: compute-tag
6666
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
6767
with:
68-
name: function-runtime-nodejs20/ga
68+
name: function-runtime-nodejs20
6969
dockerfile: nodejs20/Dockerfile
7070
context: components/runtimes/nodejs
7171
tags: ${{ needs.compute-tag.outputs.tag }}
7272

73-
build-release-image-python39-legacy:
73+
build-python39-legacy:
7474
needs: compute-tag
7575
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
7676
with:
77-
name: function-runtime-python39/ga
77+
name: function-runtime-python39
7878
dockerfile: python39/Dockerfile
7979
context: components/runtimes/python
8080
tags: ${{ needs.compute-tag.outputs.tag }}
8181

82-
build-release-image-python39:
82+
build-python39:
8383
needs: compute-tag
8484
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
8585
with:
86-
name: function-runtime-python39/ga
86+
name: function-runtime-python39
8787
dockerfile: python39/Dockerfile
8888
context: components/runtimes/python
8989
tags: ${{ needs.compute-tag.outputs.tag }}
9090

91-
build-release-image-python312:
91+
build-python312:
9292
needs: compute-tag
9393
uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main # Usage: kyma-project/test-infra/.github/workflows/image-builder.yml@main
9494
with:
95-
name: function-runtime-python312/ga
95+
name: function-runtime-python312
9696
dockerfile: python312/Dockerfile
9797
context: components/runtimes/python
9898
tags: ${{ needs.compute-tag.outputs.tag }}

Diff for: .github/workflows/serverless-build-runtime-push.yaml

-69
This file was deleted.

0 commit comments

Comments
 (0)