Skip to content

Commit 29ea942

Browse files
committed
Merge branch 'yophilav/CFS0011_1_main' of https://github.com/yophilav/iotedge into yophilav/CFS0011_1_main
2 parents 529218e + 523e310 commit 29ea942

14 files changed

Lines changed: 174 additions & 68 deletions

File tree

builds/checkin/dotnet.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
steps:
3838
- script: scripts/linux/installPrereqs.sh
3939
displayName: Install Prerequisites
40-
- task: NuGetAuthenticate@1
4140
- script: |
4241
dotnet test \
4342
--configuration $(configuration) \

builds/checkin/e2e-checkin.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ resources:
2424
branch: 'main'
2525

2626
stages:
27-
- task: NuGetAuthenticate@1
28-
2927
- template: ../misc/templates/build-images.yaml
3028
parameters:
3129
E2EBuild : true

builds/ci/dotnet.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ jobs:
4747
displayName: Install protocol head certificate # Needed for integration tests
4848
env:
4949
CERT_VALUE: $(IotHubMqttHeadCert)
50-
- task: NuGetAuthenticate@1
5150
- script: scripts/linux/buildBranch.sh -c $(Build.Configuration) --no-rocksdb-bin --skip-quickstart
5251
displayName: Build
5352
- script: sudo -E bash -c './scripts/linux/runTests.sh "$(test.filter)" "$(Build.Configuration)"'

builds/e2e/e2e.yaml

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ variables:
1515
Codeql.Enabled: false
1616
DisableDockerDetector: true
1717
# A 'minimal' pipeline only runs one end-to-end test (TempSensor). This is useful for platforms or
18-
# environments that are very similar to other platforms/environments in our matrix, Ubuntu 20.04
19-
# with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
18+
# environments that are very similar to other platforms/environments in our matrix, e.g., Ubuntu
19+
# 20.04 with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
2020
# variations in Ubuntu 22.04. In these instances the platforms/environments are so similar that we
2121
# don't reasonably expect to encounter differences--if we do, it would likely manifest during
2222
# installation, or in running a very basic test. We don't need to repeat the entire test suite.
@@ -285,6 +285,64 @@ jobs:
285285
parameters:
286286
sas_uri: $(sas_uri)
287287

288+
################################################################################
289+
- job: ubuntu_2404
290+
################################################################################
291+
displayName: Ubuntu 24.04 on amd64
292+
dependsOn: Token
293+
condition: succeeded('Token')
294+
295+
pool:
296+
name: $(pool.custom.name)
297+
demands: ubuntu2404-amd64-e2e-tests
298+
299+
variables:
300+
os: linux
301+
arch: amd64
302+
artifactName: iotedged-ubuntu24.04-amd64
303+
identityServiceArtifactName: packages_ubuntu-24.04_amd64
304+
identityServicePackageFilter: aziot-identity-service_*_amd64.deb
305+
sas_uri: $[ dependencies.Token.outputs['generate.sas_uri'] ]
306+
307+
timeoutInMinutes: 90
308+
309+
steps:
310+
- template: templates/e2e-clean-directory.yaml
311+
- template: templates/e2e-setup.yaml
312+
- template: templates/e2e-clear-docker-cached-images.yaml
313+
- template: templates/e2e-run.yaml
314+
parameters:
315+
sas_uri: $(sas_uri)
316+
317+
################################################################################
318+
- job: ubuntu_2404_arm64v8
319+
################################################################################
320+
displayName: Ubuntu 24.04 on arm64v8
321+
dependsOn: Token
322+
condition: succeeded('Token')
323+
324+
pool:
325+
name: $(pool.custom.name)
326+
demands: ubuntu2404-arm64-e2e-tests
327+
328+
variables:
329+
os: linux
330+
arch: arm64v8
331+
artifactName: iotedged-ubuntu24.04-aarch64
332+
identityServiceArtifactName: packages_ubuntu-24.04_aarch64
333+
identityServicePackageFilter: aziot-identity-service_*_arm64.deb
334+
sas_uri: $[ dependencies.Token.outputs['generate.sas_uri'] ]
335+
336+
timeoutInMinutes: 90
337+
338+
steps:
339+
- template: templates/e2e-clean-directory.yaml
340+
- template: templates/e2e-setup.yaml
341+
- template: templates/e2e-clear-docker-cached-images.yaml
342+
- template: templates/e2e-run.yaml
343+
parameters:
344+
sas_uri: $(sas_uri)
345+
288346
################################################################################
289347
- job: snaps
290348
################################################################################

builds/e2e/nested-e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ variables:
2222
Codeql.Enabled: false
2323
DisableDockerDetector: true
2424
# A 'minimal' pipeline only runs one end-to-end test (TempSensor). This is useful for platforms or
25-
# environments that are very similar to other platforms/environments in our matrix, Ubuntu 20.04
26-
# with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
25+
# environments that are very similar to other platforms/environments in our matrix, e.g., Ubuntu
26+
# 20.04 with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
2727
# variations in Ubuntu 22.04. In these instances the platforms/environments are so similar that we
2828
# don't reasonably expect to encounter differences--if we do, it would likely manifest during
2929
# installation, or in running a very basic test. We don't need to repeat the entire test suite.

builds/misc/addons-release.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ stages:
8888
jobs:
8989
- job: BuildImageApiProxy
9090
steps:
91-
- task: NuGetAuthenticate@1
9291
- bash: |
9392
if [ -z '$(version)' ]; then
9493
echo '##vso[task.setvariable variable=buildVersion]$(Build.BuildNumber)'

builds/misc/templates/build-images.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ stages:
5757
variables:
5858
Codeql.Enabled: true
5959
steps:
60-
- task: NuGetAuthenticate@1
6160
- script: scripts/linux/buildBranch.sh -c $(Build.Configuration) --no-rocksdb-bin
6261
name: build
6362
displayName: Build ($(Build.Configuration)) dotnet artifacts
@@ -160,7 +159,6 @@ stages:
160159
# Product images
161160
- job: BuildImageEdgeAgent
162161
steps:
163-
- task: NuGetAuthenticate@1
164162
- template: image-linux.yaml
165163
parameters:
166164
displayName: Edge Agent
@@ -171,7 +169,6 @@ stages:
171169

172170
- job: BuildImageEdgeHub
173171
steps:
174-
- task: NuGetAuthenticate@1
175172
- template: image-linux.yaml
176173
parameters:
177174
displayName: Edge Hub
@@ -182,7 +179,6 @@ stages:
182179

183180
- job: BuildImageTemperatureSensor
184181
steps:
185-
- task: NuGetAuthenticate@1
186182
- template: image-linux.yaml
187183
parameters:
188184
displayName: Temperature Sensor
@@ -192,7 +188,6 @@ stages:
192188

193189
- job: BuildImageDiagnostics
194190
steps:
195-
- task: NuGetAuthenticate@1
196191
- template: image-linux.yaml
197192
parameters:
198193
displayName: Diagnostics
@@ -202,7 +197,6 @@ stages:
202197

203198
- job: BuildImageMetricsCollector
204199
steps:
205-
- task: NuGetAuthenticate@1
206200
- template: image-linux.yaml
207201
parameters:
208202
displayName: Metrics Collector
@@ -212,7 +206,6 @@ stages:
212206

213207
- job: BuildImageApiProxy
214208
steps:
215-
- task: NuGetAuthenticate@1
216209
- template: image-linux.yaml
217210
parameters:
218211
displayName: API Proxy
@@ -227,7 +220,6 @@ stages:
227220
# Test images
228221
- job: BuildImageTemperatureFilter
229222
steps:
230-
- task: NuGetAuthenticate@1
231223
- template: image-linux.yaml
232224
parameters:
233225
displayName: Temperature Filter
@@ -237,7 +229,6 @@ stages:
237229

238230
- job: BuildImageLoadGen
239231
steps:
240-
- task: NuGetAuthenticate@1
241232
- template: image-linux.yaml
242233
parameters:
243234
displayName: Load Gen
@@ -247,7 +238,6 @@ stages:
247238

248239
- job: BuildImageTestAnalyzer
249240
steps:
250-
- task: NuGetAuthenticate@1
251241
- template: image-linux.yaml
252242
parameters:
253243
displayName: Test Analyzer
@@ -259,7 +249,6 @@ stages:
259249
# Functions Sample - Only supported on amd64
260250
- job: BuildImageFunctionsSample
261251
steps:
262-
- task: NuGetAuthenticate@1
263252
- template: image-linux.yaml
264253
parameters:
265254
displayName: Functions Sample
@@ -270,7 +259,6 @@ stages:
270259

271260
- job: BuildImageDirectMethodSender
272261
steps:
273-
- task: NuGetAuthenticate@1
274262
- template: image-linux.yaml
275263
parameters:
276264
displayName: Direct Method Sender
@@ -280,7 +268,6 @@ stages:
280268

281269
- job: BuildImageDirectMethodReceiver
282270
steps:
283-
- task: NuGetAuthenticate@1
284271
- template: image-linux.yaml
285272
parameters:
286273
displayName: Direct Method Receiver
@@ -290,7 +277,6 @@ stages:
290277

291278
- job: BuildImageMetricsValidator
292279
steps:
293-
- task: NuGetAuthenticate@1
294280
- template: image-linux.yaml
295281
parameters:
296282
displayName: Metrics Validator
@@ -300,7 +286,6 @@ stages:
300286

301287
- job: BuildImageNumberLogger
302288
steps:
303-
- task: NuGetAuthenticate@1
304289
- template: image-linux.yaml
305290
parameters:
306291
displayName: Number Logger
@@ -310,7 +295,6 @@ stages:
310295

311296
- job: BuildImageModuleRestarter
312297
steps:
313-
- task: NuGetAuthenticate@1
314298
- template: image-linux.yaml
315299
parameters:
316300
displayName: Module Restarter
@@ -320,7 +304,6 @@ stages:
320304

321305
- job: BuildImageTwinTester
322306
steps:
323-
- task: NuGetAuthenticate@1
324307
- template: image-linux.yaml
325308
parameters:
326309
displayName: TwinTester
@@ -331,7 +314,6 @@ stages:
331314

332315
- job: BuildImageRelayer
333316
steps:
334-
- task: NuGetAuthenticate@1
335317
- template: image-linux.yaml
336318
parameters:
337319
displayName: Relayer
@@ -341,7 +323,6 @@ stages:
341323

342324
- job: BuildImageNetworkController
343325
steps:
344-
- task: NuGetAuthenticate@1
345326
- template: image-linux.yaml
346327
parameters:
347328
displayName: Network Controller
@@ -352,7 +333,6 @@ stages:
352333

353334
- job: BuildImageTestResultCoordinator
354335
steps:
355-
- task: NuGetAuthenticate@1
356336
- template: image-linux.yaml
357337
parameters:
358338
displayName: TestResultCoordinator
@@ -363,7 +343,6 @@ stages:
363343

364344
- job: BuildImageTestMetricsCollector
365345
steps:
366-
- task: NuGetAuthenticate@1
367346
- template: image-linux.yaml
368347
parameters:
369348
displayName: Test Metrics Collector
@@ -373,7 +352,6 @@ stages:
373352

374353
- job: BuildImageDeploymentTester
375354
steps:
376-
- task: NuGetAuthenticate@1
377355
- template: image-linux.yaml
378356
parameters:
379357
displayName: DeploymentTester
@@ -383,7 +361,6 @@ stages:
383361

384362
- job: BuildImageEdgeHubRestartTester
385363
steps:
386-
- task: NuGetAuthenticate@1
387364
- template: image-linux.yaml
388365
parameters:
389366
displayName: EdgeHubRestartTester
@@ -393,7 +370,6 @@ stages:
393370

394371
- job: BuildImageCloudToDeviceMessageTester
395372
steps:
396-
- task: NuGetAuthenticate@1
397373
- template: image-linux.yaml
398374
parameters:
399375
displayName: Cloud To Device Message Tester

builds/misc/templates/build-packages.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,18 @@ stages:
107107
arch: aarch64
108108
os: ubuntu22.04
109109
target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
110+
Ubuntu2404-amd64:
111+
arch: amd64
112+
os: ubuntu24.04
113+
target.iotedged: edgelet/target/release
114+
Ubuntu2404-arm32v7:
115+
arch: arm32v7
116+
os: ubuntu24.04
117+
target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release
118+
Ubuntu2404-aarch64:
119+
arch: aarch64
120+
os: ubuntu24.04
121+
target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
110122
steps:
111123
- bash: |
112124
BASE_VERSION=`cat $BUILD_SOURCESDIRECTORY/edgelet/version.txt`

0 commit comments

Comments
 (0)