Skip to content
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
10 changes: 0 additions & 10 deletions builds/checkin/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ jobs:
demands:
- ImageOverride -equals agent-aziotedge-ubuntu-22.04-msmoby
steps:
- task: UseDotNet@2
displayName: Install .NET 10 SDK
inputs:
packageType: sdk
version: 10.0.x
- script: scripts/linux/installPrereqs.sh
displayName: Install Prerequisites
- script: |
Expand Down Expand Up @@ -68,11 +63,6 @@ jobs:
demands:
- ImageOverride -equals agent-aziotedge-ubuntu-22.04-msmoby
steps:
- task: UseDotNet@2
displayName: Install .NET 10 SDK
inputs:
packageType: sdk
version: 10.0.x
- script: scripts/linux/installPrereqs.sh
displayName: Install Prerequisites
- script: |
Expand Down
5 changes: 0 additions & 5 deletions builds/ci/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ jobs:
IotDevice2ConnStr2,
IotDevice3ConnStr2,
IotHubMqttHeadCert
- task: UseDotNet@2
displayName: Install .NET 10 SDK
inputs:
packageType: sdk
version: 10.0.x
- task: Bash@3
displayName: Install Prerequisites
inputs:
Expand Down
4 changes: 2 additions & 2 deletions builds/e2e/connectivity.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ jobs:
- agent-osbits -equals 32
- run-connectivity -equals true
variables:
identity.artifact.name: 'aziot-identity-debian11-arm32v7'
edgelet.artifact.name: 'iotedged-debian11-arm32v7'
identity.artifact.name: 'aziot-identity-debian12-arm32v7'
edgelet.artifact.name: 'iotedged-debian12-arm32v7'
sas_uri: $[ dependencies.Token.outputs['generate.sas_uri'] ]
cr.server: $[ dependencies.ContainerRegistryCredentials.outputs['acrgen.acrServer'] ]
cr.username: $[ dependencies.ContainerRegistryCredentials.outputs['acrgen.acrUsername'] ]
Expand Down
50 changes: 0 additions & 50 deletions builds/e2e/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,56 +44,6 @@ jobs:
crossJobVariables: true
serviceConnection: '$(az.subscription)'

################################################################################
- job: debian_11_arm32v7
################################################################################
displayName: Debian 11 arm32v7 (minimal)
dependsOn:
- Token
- ContainerRegistryCredentials
condition: succeeded('Token')

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

variables:
os: linux
arch: arm32v7
identityArtifactName: aziot-identity-debian11-arm32v7
artifactName: iotedged-debian11-arm32v7
dpsGroupKeySymmetric: $[ dependencies.Token.outputs['secrets.dpsGroupKeySymmetric'] ]
rootCaCertificate: $[ dependencies.Token.outputs['secrets.rootCaCertificate'] ]
rootCaKey: $[ dependencies.Token.outputs['secrets.rootCaKey'] ]
rootCaPassword: $[ dependencies.Token.outputs['secrets.rootCaPassword'] ]
sas_uri: $[ dependencies.Token.outputs['generate.sas_uri'] ]
containerRegistryServer: $[ dependencies.ContainerRegistryCredentials.outputs['acrgen.acrServer'] ]
containerRegistryUsername: $[ dependencies.ContainerRegistryCredentials.outputs['acrgen.acrUsername'] ]
containerRegistryPassword: $[ dependencies.ContainerRegistryCredentials.outputs['acrgen.acrPassword'] ]
minimal: true

steps:
- template: templates/e2e-clean-directory.yaml
- template: templates/e2e-setup.yaml
parameters:
containerRegistryServer: '$(containerRegistryServer)'
containerRegistryUsername: '$(containerRegistryUsername)'
dpsIdScope: '$(dps.idScope)'
eventHubName: '$(eventhub.name)'
eventHubFullyQualitifiedNamespace: '$(eventhub.namespace.fqdn)'
iotHubHostName: '$(iothub.hostname)'
iotHubResourceId: '$(iothub.resourceid)'
rootCaCertificate: '$(rootCaCertificate)'
rootCaKey: '$(rootCaKey)'
- template: templates/e2e-clear-docker-cached-images.yaml
- template: templates/e2e-run.yaml
parameters:
azureSubscription: '$(az.subscription)'
containerRegistryPassword: '$(containerRegistryPassword)'
dpsGroupKeySymmetric: '$(dpsGroupKeySymmetric)'
rootCaPassword: '$(rootCaPassword)'
sas_uri: '$(sas_uri)'

################################################################################
- job: debian_12_amd64
################################################################################
Expand Down
5 changes: 0 additions & 5 deletions builds/e2e/templates/e2e-setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,6 @@ steps:
ROOT_CERT: ${{ parameters.rootCaCertificate }}
ROOT_KEY: ${{ parameters.rootCaKey }}

- task: UseDotNet@2
displayName: Install .NET 10 SDK
inputs:
packageType: sdk
version: 10.0.x
- pwsh: |
$testDir = '$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test'
dotnet build $testDir
Expand Down
5 changes: 0 additions & 5 deletions builds/misc/templates/build-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ stages:
variables:
Codeql.Enabled: true
steps:
- task: UseDotNet@2
displayName: Install .NET 10 SDK
inputs:
packageType: sdk
version: 10.0.x
- script: scripts/linux/buildBranch.sh -c $(Build.Configuration) --no-rocksdb-bin ${{ iif(parameters.build_single, '--skip-quickstart', '') }}
name: build
displayName: Build ($(Build.Configuration)) dotnet artifacts
Expand Down
14 changes: 0 additions & 14 deletions builds/misc/templates/build-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,6 @@ parameters:
- arch: amd64
identity: iot-identity-service/packages/el9/amd64
iotedged: edgelet/target/rpmbuild/RPMS/x86_64
- os:
container: mcr.microsoft.com/mirror/docker/library/debian:bullseye
identity: debian:11
iotedge: debian11
targets:
- arch: amd64
identity: iot-identity-service/packages/debian11/amd64
iotedged: edgelet/target/release
- arch: arm32v7
identity: iot-identity-service/packages/debian11/arm32v7
iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release
- arch: aarch64
identity: iot-identity-service/packages/debian11/aarch64
iotedged: edgelet/target/aarch64-unknown-linux-gnu/release
- os:
container: mcr.microsoft.com/mirror/docker/library/debian:bookworm
identity: debian:12
Expand Down
6 changes: 0 additions & 6 deletions builds/service/service-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ steps:
ROOT_CERT: $(TestRootCaCertificate)
ROOT_KEY: $(TestRootCaKey)

- task: UseDotNet@2
displayName: Install .NET 10 SDK
inputs:
packageType: sdk
version: 10.0.x

- pwsh: |
$testDir = '$(Build.SourcesDirectory)/test/Microsoft.Azure.Devices.Edge.Test'
dotnet build $testDir
Expand Down
4 changes: 0 additions & 4 deletions edgelet/build/linux/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,6 @@ case "$PACKAGE_OS" in
esac
;;

'debian11')
DOCKER_IMAGE='mcr.microsoft.com/mirror/docker/library/debian:bullseye-slim'
;;

'debian12')
DOCKER_IMAGE='mcr.microsoft.com/mirror/docker/library/debian:bookworm-slim'
;;
Expand Down
4 changes: 2 additions & 2 deletions edgelet/doc/devguide.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ There are two options for building the IoT Edge Security Daemon.

Linux packages are built using the `edgelet/build/linux/package.sh` script. Set the following environment variables, then invoke the script:

1. `PACKAGE_OS`: This is the OS on which the resulting packages will be installed. It should be one of `redhat8`, `redhat9`, `debian11`, `debian12`, `ubuntu22.04`, or `ubuntu24.04`.
1. `PACKAGE_OS`: This is the OS on which the resulting packages will be installed. It should be one of `redhat8`, `redhat9`, `debian12`, `ubuntu22.04`, or `ubuntu24.04`.

1. `PACKAGE_ARCH`: This is the architecture of the OS on which the resulting packages will be installed. It should be one of `amd64`, `arm32v7` or `aarch64`.

Expand Down Expand Up @@ -67,7 +67,7 @@ dnf install -y \
libcurl-devel libuuid-devel openssl-devel &&
```

#### Debian 11-12
#### Debian 12

```sh
apt-get update
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void ThrowUnsupportedOs() =>
: SupportedPackageExtension.Deb;
break;
case "debian":
if (version != "11" && version != "12")
if (version != "12")
{
ThrowUnsupportedOs();
}
Expand Down
Loading