Skip to content

Commit

Permalink
Merge branch 'yophilav/CFS0011_1_main' of https://github.com/yophilav…
Browse files Browse the repository at this point in the history
…/iotedge into yophilav/CFS0011_1_main
  • Loading branch information
yophilav committed Sep 5, 2024
2 parents 529218e + 523e310 commit 29ea942
Show file tree
Hide file tree
Showing 14 changed files with 174 additions and 68 deletions.
1 change: 0 additions & 1 deletion builds/checkin/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ jobs:
steps:
- script: scripts/linux/installPrereqs.sh
displayName: Install Prerequisites
- task: NuGetAuthenticate@1
- script: |
dotnet test \
--configuration $(configuration) \
Expand Down
2 changes: 0 additions & 2 deletions builds/checkin/e2e-checkin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ resources:
branch: 'main'

stages:
- task: NuGetAuthenticate@1

- template: ../misc/templates/build-images.yaml
parameters:
E2EBuild : true
Expand Down
1 change: 0 additions & 1 deletion builds/ci/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
displayName: Install protocol head certificate # Needed for integration tests
env:
CERT_VALUE: $(IotHubMqttHeadCert)
- task: NuGetAuthenticate@1
- script: scripts/linux/buildBranch.sh -c $(Build.Configuration) --no-rocksdb-bin --skip-quickstart
displayName: Build
- script: sudo -E bash -c './scripts/linux/runTests.sh "$(test.filter)" "$(Build.Configuration)"'
Expand Down
62 changes: 60 additions & 2 deletions builds/e2e/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ variables:
Codeql.Enabled: false
DisableDockerDetector: true
# A 'minimal' pipeline only runs one end-to-end test (TempSensor). This is useful for platforms or
# environments that are very similar to other platforms/environments in our matrix, Ubuntu 20.04
# with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
# environments that are very similar to other platforms/environments in our matrix, e.g., Ubuntu
# 20.04 with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
# variations in Ubuntu 22.04. In these instances the platforms/environments are so similar that we
# don't reasonably expect to encounter differences--if we do, it would likely manifest during
# installation, or in running a very basic test. We don't need to repeat the entire test suite.
Expand Down Expand Up @@ -285,6 +285,64 @@ jobs:
parameters:
sas_uri: $(sas_uri)

################################################################################
- job: ubuntu_2404
################################################################################
displayName: Ubuntu 24.04 on amd64
dependsOn: Token
condition: succeeded('Token')

pool:
name: $(pool.custom.name)
demands: ubuntu2404-amd64-e2e-tests

variables:
os: linux
arch: amd64
artifactName: iotedged-ubuntu24.04-amd64
identityServiceArtifactName: packages_ubuntu-24.04_amd64
identityServicePackageFilter: aziot-identity-service_*_amd64.deb
sas_uri: $[ dependencies.Token.outputs['generate.sas_uri'] ]

timeoutInMinutes: 90

steps:
- template: templates/e2e-clean-directory.yaml
- template: templates/e2e-setup.yaml
- template: templates/e2e-clear-docker-cached-images.yaml
- template: templates/e2e-run.yaml
parameters:
sas_uri: $(sas_uri)

################################################################################
- job: ubuntu_2404_arm64v8
################################################################################
displayName: Ubuntu 24.04 on arm64v8
dependsOn: Token
condition: succeeded('Token')

pool:
name: $(pool.custom.name)
demands: ubuntu2404-arm64-e2e-tests

variables:
os: linux
arch: arm64v8
artifactName: iotedged-ubuntu24.04-aarch64
identityServiceArtifactName: packages_ubuntu-24.04_aarch64
identityServicePackageFilter: aziot-identity-service_*_arm64.deb
sas_uri: $[ dependencies.Token.outputs['generate.sas_uri'] ]

timeoutInMinutes: 90

steps:
- template: templates/e2e-clean-directory.yaml
- template: templates/e2e-setup.yaml
- template: templates/e2e-clear-docker-cached-images.yaml
- template: templates/e2e-run.yaml
parameters:
sas_uri: $(sas_uri)

################################################################################
- job: snaps
################################################################################
Expand Down
4 changes: 2 additions & 2 deletions builds/e2e/nested-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ variables:
Codeql.Enabled: false
DisableDockerDetector: true
# A 'minimal' pipeline only runs one end-to-end test (TempSensor). This is useful for platforms or
# environments that are very similar to other platforms/environments in our matrix, Ubuntu 20.04
# with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
# environments that are very similar to other platforms/environments in our matrix, e.g., Ubuntu
# 20.04 with the 'docker-ce' package vs. Ubuntu 20.04 with the 'iotedge-moby' package vs. the same
# variations in Ubuntu 22.04. In these instances the platforms/environments are so similar that we
# don't reasonably expect to encounter differences--if we do, it would likely manifest during
# installation, or in running a very basic test. We don't need to repeat the entire test suite.
Expand Down
1 change: 0 additions & 1 deletion builds/misc/addons-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ stages:
jobs:
- job: BuildImageApiProxy
steps:
- task: NuGetAuthenticate@1
- bash: |
if [ -z '$(version)' ]; then
echo '##vso[task.setvariable variable=buildVersion]$(Build.BuildNumber)'
Expand Down
24 changes: 0 additions & 24 deletions builds/misc/templates/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ stages:
variables:
Codeql.Enabled: true
steps:
- task: NuGetAuthenticate@1
- script: scripts/linux/buildBranch.sh -c $(Build.Configuration) --no-rocksdb-bin
name: build
displayName: Build ($(Build.Configuration)) dotnet artifacts
Expand Down Expand Up @@ -160,7 +159,6 @@ stages:
# Product images
- job: BuildImageEdgeAgent
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Edge Agent
Expand All @@ -171,7 +169,6 @@ stages:

- job: BuildImageEdgeHub
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Edge Hub
Expand All @@ -182,7 +179,6 @@ stages:

- job: BuildImageTemperatureSensor
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Temperature Sensor
Expand All @@ -192,7 +188,6 @@ stages:

- job: BuildImageDiagnostics
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Diagnostics
Expand All @@ -202,7 +197,6 @@ stages:

- job: BuildImageMetricsCollector
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Metrics Collector
Expand All @@ -212,7 +206,6 @@ stages:

- job: BuildImageApiProxy
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: API Proxy
Expand All @@ -227,7 +220,6 @@ stages:
# Test images
- job: BuildImageTemperatureFilter
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Temperature Filter
Expand All @@ -237,7 +229,6 @@ stages:

- job: BuildImageLoadGen
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Load Gen
Expand All @@ -247,7 +238,6 @@ stages:

- job: BuildImageTestAnalyzer
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Test Analyzer
Expand All @@ -259,7 +249,6 @@ stages:
# Functions Sample - Only supported on amd64
- job: BuildImageFunctionsSample
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Functions Sample
Expand All @@ -270,7 +259,6 @@ stages:

- job: BuildImageDirectMethodSender
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Direct Method Sender
Expand All @@ -280,7 +268,6 @@ stages:

- job: BuildImageDirectMethodReceiver
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Direct Method Receiver
Expand All @@ -290,7 +277,6 @@ stages:

- job: BuildImageMetricsValidator
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Metrics Validator
Expand All @@ -300,7 +286,6 @@ stages:

- job: BuildImageNumberLogger
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Number Logger
Expand All @@ -310,7 +295,6 @@ stages:

- job: BuildImageModuleRestarter
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Module Restarter
Expand All @@ -320,7 +304,6 @@ stages:

- job: BuildImageTwinTester
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: TwinTester
Expand All @@ -331,7 +314,6 @@ stages:

- job: BuildImageRelayer
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Relayer
Expand All @@ -341,7 +323,6 @@ stages:

- job: BuildImageNetworkController
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Network Controller
Expand All @@ -352,7 +333,6 @@ stages:

- job: BuildImageTestResultCoordinator
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: TestResultCoordinator
Expand All @@ -363,7 +343,6 @@ stages:

- job: BuildImageTestMetricsCollector
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Test Metrics Collector
Expand All @@ -373,7 +352,6 @@ stages:

- job: BuildImageDeploymentTester
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: DeploymentTester
Expand All @@ -383,7 +361,6 @@ stages:

- job: BuildImageEdgeHubRestartTester
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: EdgeHubRestartTester
Expand All @@ -393,7 +370,6 @@ stages:

- job: BuildImageCloudToDeviceMessageTester
steps:
- task: NuGetAuthenticate@1
- template: image-linux.yaml
parameters:
displayName: Cloud To Device Message Tester
Expand Down
12 changes: 12 additions & 0 deletions builds/misc/templates/build-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,18 @@ stages:
arch: aarch64
os: ubuntu22.04
target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
Ubuntu2404-amd64:
arch: amd64
os: ubuntu24.04
target.iotedged: edgelet/target/release
Ubuntu2404-arm32v7:
arch: arm32v7
os: ubuntu24.04
target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release
Ubuntu2404-aarch64:
arch: aarch64
os: ubuntu24.04
target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
steps:
- bash: |
BASE_VERSION=`cat $BUILD_SOURCESDIRECTORY/edgelet/version.txt`
Expand Down
Loading

0 comments on commit 29ea942

Please sign in to comment.