Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for snaps #7232

Merged
merged 2 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -327,3 +327,8 @@ stylecop.json
in
out

# snap{craft} files
parts/
stage/
prime/
*.snap
12 changes: 10 additions & 2 deletions builds/checkin/edgelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,16 @@ jobs:
displayName: Set env variables
- bash: scripts/linux/generic-rust/install.sh --project-root "edgelet"
displayName: Install Rust
- bash: scripts/linux/generic-rust/build.sh --project-root "edgelet" --packages "iotedge;aziot-edged" --reduced-linker
displayName: Build
- script: |
source $HOME/.cargo/env
cd edgelet
make \
CONNECT_MANAGEMENT_URI=unix:///var/run/iotedge/mgmt.sock \
CONNECT_WORKLOAD_URI=unix:///var/run/iotedge/workload.sock \
LISTEN_MANAGEMENT_URI=fd://aziot-edged.mgmt.socket \
LISTEN_WORKLOAD_URI=fd://aziot-edged.workload.socket \
release
displayName: build
- bash: edgelet/build/linux/test.sh
displayName: Test

Expand Down
37 changes: 37 additions & 0 deletions builds/e2e/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,43 @@ jobs:
- template: templates/e2e-clear-docker-cached-images.yaml
- template: templates/e2e-run.yaml

################################################################################
- job: snaps
################################################################################
displayName: Snaps

variables:
os: linux

strategy:
matrix:
amd64:
arch: amd64
pool: $(pool.linux.name)
image: agent-aziotedge-ubuntu-22.04
artifactName: iotedged-snap-amd64
identityServiceArtifactName: packages_snap_amd64
identityServicePackageFilter: azure-iot-identity_*_amd64.snap
arm64v8:
arch: arm64v8
pool: $(pool.linux.arm.name)
image: agent-aziotedge-ubuntu-22.04-arm64
artifactName: iotedged-snap-aarch64
identityServiceArtifactName: packages_snap_aarch64
identityServicePackageFilter: azure-iot-identity_*_arm64.snap

pool:
name: $(pool)
demands:
- ImageOverride -equals $(image)

steps:
- script: |
sudo snap install docker
displayName: Install Docker as a snap
- template: templates/e2e-setup.yaml
- template: templates/e2e-run.yaml

################################################################################
- job: centos7_amd64
################################################################################
Expand Down
14 changes: 1 addition & 13 deletions builds/e2e/templates/e2e-run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@ parameters:
test_type: ''

steps:
# Docker login required for the 'iotedge check' end-to-end test
- task: Docker@2
displayName: Docker login edgebuilds
inputs:
command: login
containerRegistry: iotedge-edgebuilds-acr

# This E2E test pipeline uses the following filters in order to skip certain tests:
# Flaky: Flaky on multiple platforms
# FlakyOnArm: Flaky only on arm
Expand Down Expand Up @@ -119,12 +112,7 @@ steps:
Copy-Item "$(binDir)/*-device-*.log" "$logDir/"
Copy-Item "$(binDir)/testoutput.log" "$logDir/"
Copy-Item "$(binDir)/supportbundle*" "$logDir/"
if ($test_type -eq 'upgrade_scenarios')
{
$artifactSuffix = '$(Build.BuildNumber)-$(System.JobName)' -replace '_','-'
} else {
$artifactSuffix = '$(Build.BuildNumber)-$(System.PhaseName)' -replace '_','-'
}
$artifactSuffix = '$(Build.BuildNumber)-$(System.JobIdentifier)-$(System.JobAttempt)' -replace '_','-'
Write-Output "##vso[task.setvariable variable=artifactSuffix]$artifactSuffix"
displayName: Collect Logs
condition: always()
Expand Down
Loading