Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit 68920f6

Browse files
committed
build: Re-enable ARM64 configurations
1 parent 8427387 commit 68920f6

File tree

1 file changed

+134
-134
lines changed

1 file changed

+134
-134
lines changed

.gitlab-ci.yml

Lines changed: 134 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -66,67 +66,67 @@ dhcpdd:unitTestAMD64:
6666
stage: dhcpdd:unitTest
6767
script:
6868
- dibs -unitTests -target dhcpdd-linux -platform linux/amd64 -docker
69-
# dhcpdd:unitTestARM64:
70-
# <<: *dibsJob
71-
# stage: dhcpdd:unitTest
72-
# script:
73-
# - dibs -unitTests -target dhcpdd-linux -platform linux/arm64 -docker
69+
dhcpdd:unitTestARM64:
70+
<<: *dibsJob
71+
stage: dhcpdd:unitTest
72+
script:
73+
- dibs -unitTests -target dhcpdd-linux -platform linux/arm64 -docker
7474

7575
dhcpdctl:unitTestAMD64:
7676
<<: *dibsJob
7777
stage: dhcpdctl:unitTest
7878
script:
7979
- dibs -unitTests -target dhcpdctl-linux -platform linux/amd64 -docker
80-
# dhcpdctl:unitTestARM64:
81-
# <<: *dibsJob
82-
# stage: dhcpdctl:unitTest
83-
# script:
84-
# - dibs -unitTests -target dhcpdctl-linux -platform linux/arm64 -docker
80+
dhcpdctl:unitTestARM64:
81+
<<: *dibsJob
82+
stage: dhcpdctl:unitTest
83+
script:
84+
- dibs -unitTests -target dhcpdctl-linux -platform linux/arm64 -docker
8585

8686
dhclientd:unitTestAMD64:
8787
<<: *dibsJob
8888
stage: dhclientd:unitTest
8989
script:
9090
- dibs -unitTests -target dhclientd-linux -platform linux/amd64 -docker
91-
# dhclientd:unitTestARM64:
92-
# <<: *dibsJob
93-
# stage: dhclientd:unitTest
94-
# script:
95-
# - dibs -unitTests -target dhclientd-linux -platform linux/arm64 -docker
91+
dhclientd:unitTestARM64:
92+
<<: *dibsJob
93+
stage: dhclientd:unitTest
94+
script:
95+
- dibs -unitTests -target dhclientd-linux -platform linux/arm64 -docker
9696

9797
dhclientctl:unitTestAMD64:
9898
<<: *dibsJob
9999
stage: dhclientctl:unitTest
100100
script:
101101
- dibs -unitTests -target dhclientctl-linux -platform linux/amd64 -docker
102-
# dhclientctl:unitTestARM64:
103-
# <<: *dibsJob
104-
# stage: dhclientctl:unitTest
105-
# script:
106-
# - dibs -unitTests -target dhclientctl-linux -platform linux/arm64 -docker
102+
dhclientctl:unitTestARM64:
103+
<<: *dibsJob
104+
stage: dhclientctl:unitTest
105+
script:
106+
- dibs -unitTests -target dhclientctl-linux -platform linux/arm64 -docker
107107

108108
# Integration tests
109109
dhcpdd:integrationTestAMD64:
110110
<<: *dibsJob
111111
stage: dhcpdd:integrationTest
112112
script:
113113
- dibs -integrationTests -target dhcpdd-linux -platform linux/amd64 -docker
114-
# dhcpdd:integrationTestARM64:
115-
# <<: *dibsJob
116-
# stage: dhcpdd:integrationTest
117-
# script:
118-
# - dibs -integrationTests -target dhcpdd-linux -platform linux/arm64 -docker
114+
dhcpdd:integrationTestARM64:
115+
<<: *dibsJob
116+
stage: dhcpdd:integrationTest
117+
script:
118+
- dibs -integrationTests -target dhcpdd-linux -platform linux/arm64 -docker
119119

120120
dhcpdctl:integrationTestAMD64:
121121
<<: *dibsJob
122122
stage: dhcpdctl:integrationTest
123123
script:
124124
- dibs -integrationTests -target dhcpdctl-linux -platform linux/amd64 -docker
125-
# dhcpdctl:integrationTestARM64:
126-
# <<: *dibsJob
127-
# stage: dhcpdctl:integrationTest
128-
# script:
129-
# - dibs -integrationTests -target dhcpdctl-linux -platform linux/arm64 -docker
125+
dhcpdctl:integrationTestARM64:
126+
<<: *dibsJob
127+
stage: dhcpdctl:integrationTest
128+
script:
129+
- dibs -integrationTests -target dhcpdctl-linux -platform linux/arm64 -docker
130130

131131
# Image tests
132132
# amd64 is disabled for now due to a GitLab bug where it does not exit after being run
@@ -136,34 +136,34 @@ dhcpdctl:integrationTestAMD64:
136136
# script:
137137
# - dibs -buildImage -target dhcpdd-linux -platform linux/amd64
138138
# - dibs -imageTests -target dhcpdd-linux -platform linux/amd64
139-
# dhcpdd:imageTestsARM64:
140-
# <<: *dibsJob
141-
# stage: dhcpdd:integrationTest
142-
# script:
143-
# - dibs -buildImage -target dhcpdd-linux -platform linux/arm64
144-
# - dibs -imageTests -target dhcpdd-linux -platform linux/arm64
139+
dhcpdd:imageTestsARM64:
140+
<<: *dibsJob
141+
stage: dhcpdd:integrationTest
142+
script:
143+
- dibs -buildImage -target dhcpdd-linux -platform linux/arm64
144+
- dibs -imageTests -target dhcpdd-linux -platform linux/arm64
145145

146146
dhclientd:integrationTestAMD64:
147147
<<: *dibsJob
148148
stage: dhclientd:integrationTest
149149
script:
150150
- dibs -integrationTests -target dhclientd-linux -platform linux/amd64 -docker
151-
# dhclientd:integrationTestARM64:
152-
# <<: *dibsJob
153-
# stage: dhclientd:integrationTest
154-
# script:
155-
# - dibs -integrationTests -target dhclientd-linux -platform linux/arm64 -docker
151+
dhclientd:integrationTestARM64:
152+
<<: *dibsJob
153+
stage: dhclientd:integrationTest
154+
script:
155+
- dibs -integrationTests -target dhclientd-linux -platform linux/arm64 -docker
156156

157157
dhclientctl:integrationTestAMD64:
158158
<<: *dibsJob
159159
stage: dhclientctl:integrationTest
160160
script:
161161
- dibs -integrationTests -target dhclientctl-linux -platform linux/amd64 -docker
162-
# dhclientctl:integrationTestARM64:
163-
# <<: *dibsJob
164-
# stage: dhclientctl:integrationTest
165-
# script:
166-
# - dibs -integrationTests -target dhclientctl-linux -platform linux/arm64 -docker
162+
dhclientctl:integrationTestARM64:
163+
<<: *dibsJob
164+
stage: dhclientctl:integrationTest
165+
script:
166+
- dibs -integrationTests -target dhclientctl-linux -platform linux/arm64 -docker
167167

168168
# Image tests
169169
# amd64 is disabled for now due to a GitLab bug where it does not exit after being run
@@ -173,12 +173,12 @@ dhclientctl:integrationTestAMD64:
173173
# script:
174174
# - dibs -buildImage -target dhclientd-linux -platform linux/amd64
175175
# - dibs -imageTests -target dhclientd-linux -platform linux/amd64
176-
# dhclientd:imageTestsARM64:
177-
# <<: *dibsJob
178-
# stage: dhclientd:integrationTest
179-
# script:
180-
# - dibs -buildImage -target dhclientd-linux -platform linux/arm64
181-
# - dibs -imageTests -target dhclientd-linux -platform linux/arm64
176+
dhclientd:imageTestsARM64:
177+
<<: *dibsJob
178+
stage: dhclientd:integrationTest
179+
script:
180+
- dibs -buildImage -target dhclientd-linux -platform linux/arm64
181+
- dibs -imageTests -target dhclientd-linux -platform linux/arm64
182182

183183
# Build and push image
184184
dhcpdd:buildAndPushImageAMD64:
@@ -189,14 +189,14 @@ dhcpdd:buildAndPushImageAMD64:
189189
- dibs -pushImage -target dhcpdd-linux -platform linux/amd64
190190
only:
191191
- tags
192-
# dhcpdd:buildAndPushImageARM64:
193-
# <<: *dibsJob
194-
# stage: dhcpdd:buildAndPushImage
195-
# script:
196-
# - dibs -buildImage -target dhcpdd-linux -platform linux/arm64
197-
# - dibs -pushImage -target dhcpdd-linux -platform linux/arm64
198-
# only:
199-
# - tags
192+
dhcpdd:buildAndPushImageARM64:
193+
<<: *dibsJob
194+
stage: dhcpdd:buildAndPushImage
195+
script:
196+
- dibs -buildImage -target dhcpdd-linux -platform linux/arm64
197+
- dibs -pushImage -target dhcpdd-linux -platform linux/arm64
198+
only:
199+
- tags
200200

201201
dhclientd:buildAndPushImageAMD64:
202202
<<: *dibsJob
@@ -206,14 +206,14 @@ dhclientd:buildAndPushImageAMD64:
206206
- dibs -pushImage -target dhclientd-linux -platform linux/amd64
207207
only:
208208
- tags
209-
# dhclientd:buildAndPushImageARM64:
210-
# <<: *dibsJob
211-
# stage: dhclientd:buildAndPushImage
212-
# script:
213-
# - dibs -buildImage -target dhclientd-linux -platform linux/arm64
214-
# - dibs -pushImage -target dhclientd-linux -platform linux/arm64
215-
# only:
216-
# - tags
209+
dhclientd:buildAndPushImageARM64:
210+
<<: *dibsJob
211+
stage: dhclientd:buildAndPushImage
212+
script:
213+
- dibs -buildImage -target dhclientd-linux -platform linux/arm64
214+
- dibs -pushImage -target dhclientd-linux -platform linux/arm64
215+
only:
216+
- tags
217217

218218
# Build and push manifest
219219
dhcpdd:buildAndPushManifest:
@@ -248,19 +248,19 @@ dhcpdd:buildAndPushBinariesAMD64:
248248
expire_in: 1 month
249249
only:
250250
- tags
251-
# dhcpdd:buildAndPushBinariesARM64:
252-
# <<: *dibsJob
253-
# stage: dhcpdd:buildAndPushManifestAndBinaries
254-
# script:
255-
# - dibs -build -target dhcpdd-linux -platform linux/arm64 -docker
256-
# - dibs -pushBinary -target dhcpdd-linux -platform linux/arm64
257-
# artifacts:
258-
# name: dhcpdd-binaries-arm64
259-
# paths:
260-
# - .bin/binaries/dhcpdd
261-
# expire_in: 1 month
262-
# only:
263-
# - tags
251+
dhcpdd:buildAndPushBinariesARM64:
252+
<<: *dibsJob
253+
stage: dhcpdd:buildAndPushManifestAndBinaries
254+
script:
255+
- dibs -build -target dhcpdd-linux -platform linux/arm64 -docker
256+
- dibs -pushBinary -target dhcpdd-linux -platform linux/arm64
257+
artifacts:
258+
name: dhcpdd-binaries-arm64
259+
paths:
260+
- .bin/binaries/dhcpdd
261+
expire_in: 1 month
262+
only:
263+
- tags
264264

265265
dhcpdctl:buildAndPushBinariesAMD64:
266266
<<: *dibsJob
@@ -275,19 +275,19 @@ dhcpdctl:buildAndPushBinariesAMD64:
275275
expire_in: 1 month
276276
only:
277277
- tags
278-
# dhcpdctl:buildAndPushBinariesARM64:
279-
# <<: *dibsJob
280-
# stage: dhcpdctl:buildAndPushBinaries
281-
# script:
282-
# - dibs -build -target dhcpdctl-linux -platform linux/arm64 -docker
283-
# - dibs -pushBinary -target dhcpdctl-linux -platform linux/arm64
284-
# artifacts:
285-
# name: dhcpdctl-binaries-arm64
286-
# paths:
287-
# - .bin/binaries/dhcpdctl
288-
# expire_in: 1 month
289-
# only:
290-
# - tags
278+
dhcpdctl:buildAndPushBinariesARM64:
279+
<<: *dibsJob
280+
stage: dhcpdctl:buildAndPushBinaries
281+
script:
282+
- dibs -build -target dhcpdctl-linux -platform linux/arm64 -docker
283+
- dibs -pushBinary -target dhcpdctl-linux -platform linux/arm64
284+
artifacts:
285+
name: dhcpdctl-binaries-arm64
286+
paths:
287+
- .bin/binaries/dhcpdctl
288+
expire_in: 1 month
289+
only:
290+
- tags
291291

292292
dhclientd:buildAndPushBinariesAMD64:
293293
<<: *dibsJob
@@ -302,19 +302,19 @@ dhclientd:buildAndPushBinariesAMD64:
302302
expire_in: 1 month
303303
only:
304304
- tags
305-
# dhclientd:buildAndPushBinariesARM64:
306-
# <<: *dibsJob
307-
# stage: dhclientd:buildAndPushManifestAndBinaries
308-
# script:
309-
# - dibs -build -target dhclientd-linux -platform linux/arm64 -docker
310-
# - dibs -pushBinary -target dhclientd-linux -platform linux/arm64
311-
# artifacts:
312-
# name: dhclientd-binaries-arm64
313-
# paths:
314-
# - .bin/binaries/dhclientd
315-
# expire_in: 1 month
316-
# only:
317-
# - tags
305+
dhclientd:buildAndPushBinariesARM64:
306+
<<: *dibsJob
307+
stage: dhclientd:buildAndPushManifestAndBinaries
308+
script:
309+
- dibs -build -target dhclientd-linux -platform linux/arm64 -docker
310+
- dibs -pushBinary -target dhclientd-linux -platform linux/arm64
311+
artifacts:
312+
name: dhclientd-binaries-arm64
313+
paths:
314+
- .bin/binaries/dhclientd
315+
expire_in: 1 month
316+
only:
317+
- tags
318318

319319
dhclientctl:buildAndPushBinariesAMD64:
320320
<<: *dibsJob
@@ -329,19 +329,19 @@ dhclientctl:buildAndPushBinariesAMD64:
329329
expire_in: 1 month
330330
only:
331331
- tags
332-
# dhclientctl:buildAndPushBinariesARM64:
333-
# <<: *dibsJob
334-
# stage: dhclientctl:buildAndPushBinaries
335-
# script:
336-
# - dibs -build -target dhclientctl-linux -platform linux/arm64 -docker
337-
# - dibs -pushBinary -target dhclientctl-linux -platform linux/arm64
338-
# artifacts:
339-
# name: dhclientctl-binaries-arm64
340-
# paths:
341-
# - .bin/binaries/dhclientctl
342-
# expire_in: 1 month
343-
# only:
344-
# - tags
332+
dhclientctl:buildAndPushBinariesARM64:
333+
<<: *dibsJob
334+
stage: dhclientctl:buildAndPushBinaries
335+
script:
336+
- dibs -build -target dhclientctl-linux -platform linux/arm64 -docker
337+
- dibs -pushBinary -target dhclientctl-linux -platform linux/arm64
338+
artifacts:
339+
name: dhclientctl-binaries-arm64
340+
paths:
341+
- .bin/binaries/dhclientctl
342+
expire_in: 1 month
343+
only:
344+
- tags
345345

346346
# Chart tests
347347
dhcpdd:chartTestsAMD64:
@@ -351,13 +351,13 @@ dhcpdd:chartTestsAMD64:
351351
- dibs -chartTests -target dhcpdd-linux -platform linux/amd64 -docker
352352
only:
353353
- tags
354-
# dhcpdd:chartTestsARM64:
355-
# <<: *dibsJob
356-
# stage: dhcpdd:chartIntegrationTest
357-
# script:
358-
# - dibs -chartTests -target dhcpdd-linux -platform linux/arm64 -docker
359-
# only:
360-
# - tags
354+
dhcpdd:chartTestsARM64:
355+
<<: *dibsJob
356+
stage: dhcpdd:chartIntegrationTest
357+
script:
358+
- dibs -chartTests -target dhcpdd-linux -platform linux/arm64 -docker
359+
only:
360+
- tags
361361

362362
dhclientd:chartTestsAMD64:
363363
<<: *dibsJob
@@ -366,13 +366,13 @@ dhclientd:chartTestsAMD64:
366366
- dibs -chartTests -target dhclientd-linux -platform linux/amd64 -docker
367367
only:
368368
- tags
369-
# dhclientd:chartTestsARM64:
370-
# <<: *dibsJob
371-
# stage: dhclientd:chartIntegrationTest
372-
# script:
373-
# - dibs -chartTests -target dhclientd-linux -platform linux/arm64 -docker
374-
# only:
375-
# - tags
369+
dhclientd:chartTestsARM64:
370+
<<: *dibsJob
371+
stage: dhclientd:chartIntegrationTest
372+
script:
373+
- dibs -chartTests -target dhclientd-linux -platform linux/arm64 -docker
374+
only:
375+
- tags
376376

377377
# Build and push chart
378378
dhcpdd:buildAndPushChart:

0 commit comments

Comments
 (0)