Skip to content

Commit cb4a12a

Browse files
zhihangdengpre-commit-ci[bot]
zhihangdeng
and
pre-commit-ci[bot]
authored
Add openEuler OS support for one-click deployment (#2267)
Signed-off-by: zhihang <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent fdaf687 commit cb4a12a

File tree

9 files changed

+313
-102
lines changed

9 files changed

+313
-102
lines changed

‎.github/workflows/_run-one-click.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ on:
2727
description: 'Test examples with docker compose or k8s charts'
2828
required: true
2929
type: string
30+
os:
31+
description: OS to run the test on
32+
required: true
33+
type: string
3034
hardware:
3135
description: Hardware to run the test on
3236
required: true
@@ -103,7 +107,8 @@ jobs:
103107
INPUT_DATA=$(
104108
jq -r --arg type "${{ inputs.deploy_method }}" --arg id "${{ inputs.example }}" \
105109
'.[$type][$id].inputs.clear[]' ${{ github.workspace }}/.github/workflows/one-click-inputs-nobuild.json | \
106-
sed "s/\$hardware/${{ inputs.hardware }}/g"
110+
sed "s|\$hardware|${{ inputs.hardware }}|g; \
111+
s|\$os|${{ inputs.os }}|g"
107112
)
108113
echo "Generated input:"
109114
echo "$INPUT_DATA"
@@ -115,7 +120,6 @@ jobs:
115120
- name: Install dependencies
116121
run: |
117122
# Use flock to prevent apt conflicts when multiple instances run
118-
sudo rm -f /etc/apt/sources.list.d/helm-stable-debian.list || true
119123
sudo flock /var/lib/dpkg/lock-frontend apt update
120124
sudo flock /var/lib/dpkg/lock-frontend apt install -y python3-pip
121125
@@ -160,6 +164,7 @@ jobs:
160164
jq -r --arg type "${{ inputs.deploy_method }}" --arg id "${{ inputs.example }}" \
161165
'.[$type][$id].inputs.deploy[]' ${{ github.workspace }}/.github/workflows/one-click-inputs-nobuild.json | \
162166
sed "s|\$hardware|${{ inputs.hardware }}|g; \
167+
s|\$os|${{ inputs.os }}|g; \
163168
s|\$HF_TOKEN|$HF_TOKEN|g; \
164169
s|\$LLM_model|$LLM_model|g; \
165170
s|\$Embedding_model|$Embedding_model|g; \
@@ -188,7 +193,8 @@ jobs:
188193
INPUT_DATA=$(
189194
jq -r --arg type "${{ inputs.deploy_method }}" --arg id "${{ inputs.example }}" \
190195
'.[$type][$id].inputs.clear[]' ${{ github.workspace }}/.github/workflows/one-click-inputs-nobuild.json | \
191-
sed "s/\$hardware/${{ inputs.hardware }}/g"
196+
sed "s|\$hardware|${{ inputs.hardware }}|g; \
197+
s|\$os|${{ inputs.os }}|g"
192198
)
193199
echo "Generated input:"
194200
echo "$INPUT_DATA"

‎.github/workflows/one-click-inputs-nobuild.json‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"1",
88
"1",
99
"docker",
10+
"$os",
1011
"$hardware",
1112
"$HF_TOKEN",
1213
"$http_proxy",
@@ -21,7 +22,7 @@
2122
"y",
2223
"Y"
2324
],
24-
"clear": ["1", "1", "2", "docker", "$hardware", "Y"]
25+
"clear": ["1", "1", "2", "docker", "$os", "$hardware", "Y"]
2526
}
2627
},
2728
"ChatQnA-Qwen": {
@@ -31,6 +32,7 @@
3132
"1",
3233
"1",
3334
"docker",
35+
"$os",
3436
"$hardware",
3537
"$HF_TOKEN",
3638
"$http_proxy",
@@ -45,7 +47,7 @@
4547
"y",
4648
"Y"
4749
],
48-
"clear": ["1", "1", "2", "docker", "$hardware", "Y"]
50+
"clear": ["1", "1", "2", "docker", "$os", "$hardware", "Y"]
4951
}
5052
},
5153
"CodeTrans": {
@@ -55,6 +57,7 @@
5557
"1",
5658
"1",
5759
"docker",
60+
"$os",
5861
"$hardware",
5962
"$HF_TOKEN",
6063
"$http_proxy",
@@ -66,7 +69,7 @@
6669
"y",
6770
"Y"
6871
],
69-
"clear": ["2", "1", "2", "docker", "$hardware", "Y"]
72+
"clear": ["2", "1", "2", "docker", "$os", "$hardware", "Y"]
7073
}
7174
},
7275
"DocSum": {
@@ -76,6 +79,7 @@
7679
"1",
7780
"1",
7881
"docker",
82+
"$os",
7983
"$hardware",
8084
"$HF_TOKEN",
8185
"$http_proxy",
@@ -87,7 +91,7 @@
8791
"y",
8892
"Y"
8993
],
90-
"clear": ["3", "1", "2", "docker", "$hardware", "Y"]
94+
"clear": ["3", "1", "2", "docker", "$os", "$hardware", "Y"]
9195
}
9296
},
9397
"CodeGen": {
@@ -97,6 +101,7 @@
97101
"1",
98102
"1",
99103
"docker",
104+
"$os",
100105
"$hardware",
101106
"$HF_TOKEN",
102107
"$http_proxy",
@@ -108,7 +113,7 @@
108113
"y",
109114
"Y"
110115
],
111-
"clear": ["4", "1", "2", "docker", "$hardware", "Y"]
116+
"clear": ["4", "1", "2", "docker", "$os", "$hardware", "Y"]
112117
}
113118
},
114119
"AudioQnA": {
@@ -118,6 +123,7 @@
118123
"1",
119124
"1",
120125
"docker",
126+
"$os",
121127
"$hardware",
122128
"$HF_TOKEN",
123129
"$http_proxy",
@@ -129,7 +135,7 @@
129135
"y",
130136
"Y"
131137
],
132-
"clear": ["5", "1", "2", "docker", "$hardware", "Y"]
138+
"clear": ["5", "1", "2", "docker", "$os", "$hardware", "Y"]
133139
}
134140
},
135141
"VisualQnA": {
@@ -139,6 +145,7 @@
139145
"1",
140146
"1",
141147
"docker",
148+
"$os",
142149
"$hardware",
143150
"$HF_TOKEN",
144151
"$http_proxy",
@@ -150,7 +157,7 @@
150157
"y",
151158
"Y"
152159
],
153-
"clear": ["6", "1", "2", "docker", "$hardware", "Y"]
160+
"clear": ["6", "1", "2", "docker", "$os", "$hardware", "Y"]
154161
}
155162
},
156163
"FaqGen": {
@@ -160,6 +167,7 @@
160167
"1",
161168
"1",
162169
"docker",
170+
"$os",
163171
"$hardware",
164172
"$HF_TOKEN",
165173
"$http_proxy",
@@ -171,7 +179,7 @@
171179
"y",
172180
"Y"
173181
],
174-
"clear": ["7", "1", "2", "docker", "$hardware", "Y"]
182+
"clear": ["7", "1", "2", "docker", "$os", "$hardware", "Y"]
175183
}
176184
},
177185
"AgentQnA": {
@@ -181,6 +189,7 @@
181189
"1",
182190
"1",
183191
"docker",
192+
"$os",
184193
"$hardware",
185194
"$HF_TOKEN",
186195
"$http_proxy",
@@ -193,7 +202,7 @@
193202
"y",
194203
"Y"
195204
],
196-
"clear": ["8", "1", "2", "docker", "$hardware", "Y"]
205+
"clear": ["8", "1", "2", "docker", "$os", "$hardware", "Y"]
197206
}
198207
}
199208
},
@@ -205,6 +214,7 @@
205214
"1",
206215
"1",
207216
"k8s",
217+
"$os",
208218
"$hardware",
209219
"$HF_TOKEN",
210220
"$http_proxy",
@@ -219,7 +229,7 @@
219229
"8080",
220230
"Y"
221231
],
222-
"clear": ["1", "1", "2", "k8s", "y", "Y"]
232+
"clear": ["1", "1", "2", "k8s", "$os", "y", "Y"]
223233
}
224234
},
225235
"ChatQnA-Qwen": {
@@ -229,6 +239,7 @@
229239
"1",
230240
"1",
231241
"k8s",
242+
"$os",
232243
"$hardware",
233244
"$HF_TOKEN",
234245
"$http_proxy",
@@ -243,7 +254,7 @@
243254
"8080",
244255
"Y"
245256
],
246-
"clear": ["1", "1", "2", "k8s", "y", "Y"]
257+
"clear": ["1", "1", "2", "k8s", "$os", "y", "Y"]
247258
}
248259
},
249260
"CodeTrans": {
@@ -253,6 +264,7 @@
253264
"1",
254265
"1",
255266
"k8s",
267+
"$os",
256268
"$hardware",
257269
"$HF_TOKEN",
258270
"$http_proxy",
@@ -265,7 +277,7 @@
265277
"8080",
266278
"Y"
267279
],
268-
"clear": ["2", "1", "2", "k8s", "y", "Y"]
280+
"clear": ["2", "1", "2", "k8s", "$os", "y", "Y"]
269281
}
270282
},
271283
"DocSum": {
@@ -275,6 +287,7 @@
275287
"1",
276288
"1",
277289
"k8s",
290+
"$os",
278291
"$hardware",
279292
"$HF_TOKEN",
280293
"$http_proxy",
@@ -287,7 +300,7 @@
287300
"8080",
288301
"Y"
289302
],
290-
"clear": ["3", "1", "2", "k8s", "y", "Y"]
303+
"clear": ["3", "1", "2", "k8s", "$os", "y", "Y"]
291304
}
292305
},
293306
"CodeGen": {
@@ -297,6 +310,7 @@
297310
"1",
298311
"1",
299312
"k8s",
313+
"$os",
300314
"$hardware",
301315
"$HF_TOKEN",
302316
"$http_proxy",
@@ -309,7 +323,7 @@
309323
"8080",
310324
"Y"
311325
],
312-
"clear": ["4", "1", "2", "k8s", "y", "Y"]
326+
"clear": ["4", "1", "2", "k8s", "$os", "y", "Y"]
313327
}
314328
},
315329
"AudioQnA": {
@@ -319,6 +333,7 @@
319333
"1",
320334
"1",
321335
"k8s",
336+
"$os",
322337
"$hardware",
323338
"$HF_TOKEN",
324339
"$http_proxy",
@@ -331,7 +346,7 @@
331346
"8080",
332347
"Y"
333348
],
334-
"clear": ["5", "1", "2", "k8s", "y", "Y"]
349+
"clear": ["5", "1", "2", "k8s", "$os", "y", "Y"]
335350
}
336351
},
337352
"VisualQnA": {
@@ -341,6 +356,7 @@
341356
"1",
342357
"1",
343358
"k8s",
359+
"$os",
344360
"$hardware",
345361
"$HF_TOKEN",
346362
"$http_proxy",
@@ -353,7 +369,7 @@
353369
"8080",
354370
"Y"
355371
],
356-
"clear": ["6", "1", "2", "k8s", "y", "Y"]
372+
"clear": ["6", "1", "2", "k8s", "$os", "y", "Y"]
357373
}
358374
},
359375
"FaqGen": {
@@ -363,6 +379,7 @@
363379
"1",
364380
"1",
365381
"k8s",
382+
"$os",
366383
"$hardware",
367384
"$HF_TOKEN",
368385
"$http_proxy",
@@ -375,7 +392,7 @@
375392
"8080",
376393
"Y"
377394
],
378-
"clear": ["7", "1", "2", "k8s", "y", "Y"]
395+
"clear": ["7", "1", "2", "k8s", "$os", "y", "Y"]
379396
}
380397
},
381398
"AgentQnA": {
@@ -385,6 +402,7 @@
385402
"1",
386403
"1",
387404
"k8s",
405+
"$os",
388406
"$hardware",
389407
"$HF_TOKEN",
390408
"$http_proxy",
@@ -398,7 +416,7 @@
398416
"8080",
399417
"Y"
400418
],
401-
"clear": ["8", "1", "2", "k8s", "y", "Y"]
419+
"clear": ["8", "1", "2", "k8s", "$os", "y", "Y"]
402420
}
403421
}
404422
}

0 commit comments

Comments
 (0)