diff --git a/builds/checkin/dotnet.yaml b/builds/checkin/dotnet.yaml index 2b703cd936d..24a274c823f 100644 --- a/builds/checkin/dotnet.yaml +++ b/builds/checkin/dotnet.yaml @@ -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: | @@ -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: | diff --git a/builds/ci/dotnet.yaml b/builds/ci/dotnet.yaml index 01344a36fa8..9cbbc3b507b 100644 --- a/builds/ci/dotnet.yaml +++ b/builds/ci/dotnet.yaml @@ -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: diff --git a/builds/e2e/connectivity.yaml b/builds/e2e/connectivity.yaml index 1d68f7f0494..44f0db34180 100644 --- a/builds/e2e/connectivity.yaml +++ b/builds/e2e/connectivity.yaml @@ -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'] ] diff --git a/builds/e2e/e2e.yaml b/builds/e2e/e2e.yaml index 1affa74a6c9..e97bc0bc284 100644 --- a/builds/e2e/e2e.yaml +++ b/builds/e2e/e2e.yaml @@ -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 ################################################################################ diff --git a/builds/e2e/templates/e2e-setup.yaml b/builds/e2e/templates/e2e-setup.yaml index 9eca56ca766..d183d6ccc69 100644 --- a/builds/e2e/templates/e2e-setup.yaml +++ b/builds/e2e/templates/e2e-setup.yaml @@ -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 diff --git a/builds/misc/templates/build-images.yaml b/builds/misc/templates/build-images.yaml index 3592425d611..f0ea2b5352c 100644 --- a/builds/misc/templates/build-images.yaml +++ b/builds/misc/templates/build-images.yaml @@ -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 diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml index cbf3c1e0f18..3a19ccb3312 100644 --- a/builds/misc/templates/build-packages.yaml +++ b/builds/misc/templates/build-packages.yaml @@ -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 diff --git a/builds/service/service-deployment.yaml b/builds/service/service-deployment.yaml index a25ea08b1db..3eddef95bc0 100644 --- a/builds/service/service-deployment.yaml +++ b/builds/service/service-deployment.yaml @@ -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 diff --git a/edgelet/build/linux/package.sh b/edgelet/build/linux/package.sh index d609903124e..016bdecb23a 100755 --- a/edgelet/build/linux/package.sh +++ b/edgelet/build/linux/package.sh @@ -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' ;; diff --git a/edgelet/doc/devguide.md b/edgelet/doc/devguide.md index d5624399814..cc14ed732ee 100644 --- a/edgelet/doc/devguide.md +++ b/edgelet/doc/devguide.md @@ -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`. @@ -67,7 +67,7 @@ dnf install -y \ libcurl-devel libuuid-devel openssl-devel && ``` -#### Debian 11-12 +#### Debian 12 ```sh apt-get update diff --git a/test/Microsoft.Azure.Devices.Edge.Test.Common/linux/EdgeDaemon.cs b/test/Microsoft.Azure.Devices.Edge.Test.Common/linux/EdgeDaemon.cs index 02593079891..afa902adc9e 100644 --- a/test/Microsoft.Azure.Devices.Edge.Test.Common/linux/EdgeDaemon.cs +++ b/test/Microsoft.Azure.Devices.Edge.Test.Common/linux/EdgeDaemon.cs @@ -64,7 +64,7 @@ void ThrowUnsupportedOs() => : SupportedPackageExtension.Deb; break; case "debian": - if (version != "11" && version != "12") + if (version != "12") { ThrowUnsupportedOs(); }