Skip to content
This repository was archived by the owner on May 14, 2025. It is now read-only.

Commit 281a45e

Browse files
author
Corneil du Plessis
committed
Fix build-images.sh
1 parent 85e3557 commit 281a45e

File tree

4 files changed

+228
-239
lines changed

4 files changed

+228
-239
lines changed

‎.github/actions/build-images/build-images.sh

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,11 @@ function pack_image {
3131
fi
3232
echo "Created: $REPO:$TAG-jdk$v"
3333
}
34-
35-
TARGETS=("spring-cloud-dataflow-server/target/spring-cloud-dataflow-server" \
36-
"spring-cloud-skipper/spring-cloud-skipper-server/target/spring-cloud-skipper-server" \
37-
"spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner" \
38-
"spring-cloud-dataflow-single-step-batch-job/target/spring-cloud-dataflow-single-step-batch-job" \
39-
"spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target/spring-cloud-dataflow-tasklauncher-sink-kafka" \
40-
"spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-rabbit/target/spring-cloud-dataflow-tasklauncher-sink-rabbit")
41-
42-
IMAGES=("springcloud/spring-cloud-dataflow-server" \
43-
"springcloud/spring-cloud-skipper-server" \
44-
"springcloud/spring-cloud-dataflow-composed-task-runner" \
45-
"springcloud/spring-cloud-dataflow-single-step-batch-job" \
46-
"springcloud/spring-cloud-dataflow-tasklauncher-sink-kafka" \
47-
"springcloud/spring-cloud-dataflow-tasklauncher-sink-rabbit")
48-
49-
MAVEN_ARTIFACT_IDS=("spring-cloud-dataflow-server" \
50-
"spring-cloud-dataflow-server" \
51-
"spring-cloud-dataflow-composed-task-runner" \
52-
"spring-cloud-dataflow-tasklauncher-sink-kafka" \
53-
"spring-cloud-dataflow-tasklauncher-sink-rabbit")
54-
len=${#TARGETS[@]}
55-
imageLen=${#IMAGES[@]}
56-
if ((len != imageLen)); then
57-
echo "Expected $len == $imageLen"
58-
exit 1
59-
fi
60-
61-
for ((i = 0; i < len; i++)); do
62-
TARGET="${TARGETS[i]}"
63-
IMAGE="${IMAGES[i]}"
64-
ARTIFACT_ID="${MAVEN_ARTIFACT_IDS[i]}"
34+
LEN=$(jq '.include | length' .github/workflows/images.json)
35+
for ((i = 0; i < LEN; i++)); do
36+
TARGET="$(jq -r --arg index $i '.include[$index | tonumber] | .path' .github/workflows/images.json)"
37+
IMAGE="$(jq -r --arg index $i '.include[$index | tonumber ] | .image' .github/workflows/images.json)"
38+
ARTIFACT_ID="$(jq -r --arg index $i '.include[$index | tonumber ] | .name' .github/workflows/images.json)"
6539
for v in 8 11 17 21; do
6640
pack_image $TARGET $IMAGE $v $ARTIFACT_ID
6741
RC=$?

‎.github/workflows/images.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
"path": "spring-cloud-dataflow-composed-task-runner/target",
1616
"image": "springcloud/spring-cloud-dataflow-composed-task-runner"
1717
},
18+
{
19+
"name": "spring-cloud-dataflow-single-step-batch-job",
20+
"path": "spring-cloud-dataflow-single-step-batch-job/target",
21+
"image": "springcloud/spring-cloud-dataflow-single-step-batch-job"
22+
},
1823
{
1924
"name": "spring-cloud-dataflow-tasklauncher-sink-kafka",
2025
"path": "spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-sink-kafka/target",

‎.github/workflows/release-controller.yml

Lines changed: 107 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -14,101 +14,111 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616

17-
# initial is when user starts workflow from UI(context is empty)
18-
# then train build goes through via repos using defined hander rules
19-
- name: Handle Zoo Control
20-
uses: jvalkeal/build-zoo-handler@v0.0.4
21-
with:
22-
dispatch-handler-token: ${{ secrets.SCDF_ACCESS_TOKEN }}
23-
dispatch-handler-max: 20
24-
dispatch-handler-config: >
25-
[
26-
{
27-
"if": "initial == true",
28-
"action": "workflow_dispatch",
29-
"workflow_dispatch": {
30-
"owner": "spring-cloud",
31-
"repo": "spring-cloud-deployer",
32-
"ref": "main",
33-
"workflow": "release-worker.yml"
17+
# initial is when user starts workflow from UI(context is empty)
18+
# then train build goes through via repos using defined hander rules
19+
- name: Handle Zoo Control
20+
uses: jvalkeal/build-zoo-handler@v0.0.4
21+
with:
22+
dispatch-handler-token: ${{ secrets.SCDF_ACCESS_TOKEN }}
23+
dispatch-handler-max: 20
24+
dispatch-handler-config: >
25+
[
26+
{
27+
"if": "initial == true",
28+
"action": "workflow_dispatch",
29+
"workflow_dispatch": {
30+
"owner": "spring-cloud",
31+
"repo": "spring-cloud-deployer",
32+
"ref": "main",
33+
"workflow": "release-worker.yml"
34+
}
35+
},
36+
{
37+
"if": "data.event == 'build-succeed' && data.repo == 'spring-cloud-deployer' && data.owner == 'spring-cloud'",
38+
"action": "workflow_dispatch",
39+
"workflow_dispatch": {
40+
"owner": "spring-cloud",
41+
"repo": "spring-cloud-dataflow-ui",
42+
"ref": "main",
43+
"workflow": "release-worker.yml"
44+
}
45+
},
46+
{
47+
"if": "data.event == 'build-succeed' && data.repo == 'spring-cloud-dataflow-ui' && data.owner == 'spring-cloud'",
48+
"action": "workflow_dispatch",
49+
"workflow_dispatch": {
50+
"owner": "spring-cloud",
51+
"repo": "spring-cloud-dataflow",
52+
"ref": "main",
53+
"workflow": "release-worker.yml"
54+
}
55+
},
56+
{
57+
"if": "data.event == 'build-succeed' && data.repo == 'spring-cloud-dataflow' && data.owner == 'spring-cloud'",
58+
"action": "workflow_dispatch",
59+
"workflow_dispatch": {
60+
"owner": "spring-cloud",
61+
"repo": "spring-cloud-dataflow",
62+
"ref": "main",
63+
"workflow": "carvel-worker.yml"
64+
}
65+
},
66+
{
67+
"if": "data.event == 'carvel-succeed' && data.repo == 'spring-cloud-dataflow' && data.owner == 'spring-cloud'",
68+
"action": "workflow_dispatch",
69+
"workflow_dispatch": {
70+
"owner": "spring-cloud",
71+
"repo": "spring-cloud-dataflow",
72+
"ref": "main",
73+
"workflow": "promote-release.yml"
74+
}
75+
},
76+
{
77+
"if": "data.event == 'promote-succeed' && data.repo == 'spring-cloud-dataflow' && data.owner == 'spring-cloud'",
78+
"action": "workflow_dispatch",
79+
"workflow_dispatch": {
80+
"owner": "spring-cloud",
81+
"repo": "spring-cloud-dataflow",
82+
"ref": "main",
83+
"workflow": "central-release.yml"
84+
}
85+
},
86+
{
87+
"if": "data.event == 'central-succeed' && data.repo == 'spring-cloud-dataflow' && data.owner == 'spring-cloud'",
88+
"action": "workflow_dispatch",
89+
"workflow_dispatch": {
90+
"owner": "spring-cloud",
91+
"repo": "spring-cloud-dataflow",
92+
"ref": "main",
93+
"workflow": "github-release.yml"
94+
}
95+
},
96+
{
97+
"if": "data.event == 'promotion-failed'",
98+
"action": "fail",
99+
"fail": {
100+
"message": "artifactory promotion failed"
101+
}
102+
},
103+
{
104+
"if": "data.event == 'central-failed'",
105+
"action": "fail",
106+
"fail": {
107+
"message": "central sync failed"
108+
}
109+
},
110+
{
111+
"if": "data.event == 'ghrelease-failed'",
112+
"action": "fail",
113+
"fail": {
114+
"message": "github release failed"
115+
}
116+
},
117+
{
118+
"if": "data.event == 'build-failed'",
119+
"action": "fail",
120+
"fail": {
121+
"message": "something went wrong in build train"
122+
}
34123
}
35-
},
36-
{
37-
"if": "data.event == 'build-succeed' && data.repo == 'spring-cloud-deployer' && data.owner == 'spring-cloud'",
38-
"action": "workflow_dispatch",
39-
"workflow_dispatch": {
40-
"owner": "spring-cloud",
41-
"repo": "spring-cloud-dataflow-ui",
42-
"ref": "main",
43-
"workflow": "release-worker.yml"
44-
}
45-
},
46-
{
47-
"if": "data.event == 'build-succeed' && data.repo == 'spring-cloud-dataflow-ui' && data.owner == 'spring-cloud'",
48-
"action": "workflow_dispatch",
49-
"workflow_dispatch": {
50-
"owner": "spring-cloud",
51-
"repo": "spring-cloud-dataflow",
52-
"ref": "main",
53-
"workflow": "release-worker.yml"
54-
}
55-
},
56-
{
57-
"if": "data.event == 'build-succeed' && data.repo == 'spring-cloud-dataflow' && data.owner == 'spring-cloud'",
58-
"action": "workflow_dispatch",
59-
"workflow_dispatch": {
60-
"owner": "spring-cloud",
61-
"repo": "spring-cloud-dataflow",
62-
"ref": "main",
63-
"workflow": "promote-release.yml"
64-
}
65-
},
66-
{
67-
"if": "data.event == 'promote-succeed' && data.repo == 'spring-cloud-dataflow' && data.owner == 'spring-cloud'",
68-
"action": "workflow_dispatch",
69-
"workflow_dispatch": {
70-
"owner": "spring-cloud",
71-
"repo": "spring-cloud-dataflow",
72-
"ref": "main",
73-
"workflow": "central-release.yml"
74-
}
75-
},
76-
{
77-
"if": "data.event == 'central-succeed' && data.repo == 'spring-cloud-dataflow' && data.owner == 'spring-cloud'",
78-
"action": "workflow_dispatch",
79-
"workflow_dispatch": {
80-
"owner": "spring-cloud",
81-
"repo": "spring-cloud-dataflow",
82-
"ref": "main",
83-
"workflow": "github-release.yml"
84-
}
85-
},
86-
{
87-
"if": "data.event == 'promotion-failed'",
88-
"action": "fail",
89-
"fail": {
90-
"message": "artifactory promotion failed"
91-
}
92-
},
93-
{
94-
"if": "data.event == 'central-failed'",
95-
"action": "fail",
96-
"fail": {
97-
"message": "central sync failed"
98-
}
99-
},
100-
{
101-
"if": "data.event == 'ghrelease-failed'",
102-
"action": "fail",
103-
"fail": {
104-
"message": "github release failed"
105-
}
106-
},
107-
{
108-
"if": "data.event == 'build-failed'",
109-
"action": "fail",
110-
"fail": {
111-
"message": "something went wrong in build train"
112-
}
113-
}
114-
]
124+
]

0 commit comments

Comments
 (0)