Skip to content

Commit

Permalink
Get main branch ready for 1.5 (#7263)
Browse files Browse the repository at this point in the history
This change makes the following updates to prepare for the 1.5 release:
- Removes release pipelines that are now managed internally - Metrics Collector auto-refresh, Core Images auto-refresh
- Removes obsolete pipelines - Metrics Collector publish and release, which are superceded by the auto-refresh pipeline (manually triggered)
- Removes support for CentOS 7 and Debian 10. These distros will reach end of support in June 2024, which is close enough to the anticipated release of 1.5 that we won't support them. They will continue to be supported in 1.4 LTS through June.
- Updated various version references throughout the codebase to 1.5

To test, I ran the CI build and end-to-end test pipelines and confirmed everything passes.

## Azure IoT Edge PR checklist:
  • Loading branch information
damonbarry authored Apr 19, 2024
1 parent 7508ffc commit c13dabb
Show file tree
Hide file tree
Showing 43 changed files with 83 additions and 2,380 deletions.
2 changes: 1 addition & 1 deletion builds/checkin/edgelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ jobs:
- script: scripts/linux/generic-rust/install.sh --project-root "edgelet"
displayName: Install Rust
- script: |
$CARGO install --locked cargo-tarpaulin
$CARGO install --locked --version 0.26.1 cargo-tarpaulin
workingDirectory: edgelet
displayName: Install Cargo Tarpaulin
- script: |
Expand Down
46 changes: 0 additions & 46 deletions builds/e2e/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,6 @@ jobs:
- template: templates/e2e-clear-docker-cached-images.yaml
- template: templates/e2e-run.yaml

################################################################################
- job: debian_10_arm32v7
################################################################################
displayName: Debian 10 arm32v7 (minimal)

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

variables:
os: linux
arch: arm32v7
artifactName: iotedged-debian10-arm32v7
identityServiceArtifactName: packages_debian-10-slim_arm32v7
identityServicePackageFilter: aziot-identity-service_*_armhf.deb
minimal: true

timeoutInMinutes: 120

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

################################################################################
- job: ubuntu_2004_msmoby
################################################################################
Expand Down Expand Up @@ -225,27 +200,6 @@ jobs:
- template: templates/e2e-setup.yaml
- template: templates/e2e-run.yaml

################################################################################
- job: centos7_amd64
################################################################################
displayName: CentOs7 amd64

pool:
name: $(pool.linux.name)
demands:
- ImageOverride -equals agent-aziotedge-centos-7-msmoby

variables:
os: linux
arch: amd64
artifactName: iotedged-centos7-amd64
identityServiceArtifactName: packages_centos-7_amd64
identityServicePackageFilter: aziot-identity-service-?.*.x86_64.rpm

steps:
- template: templates/e2e-setup.yaml
- template: templates/e2e-run.yaml

################################################################################
- job: redhat8_amd64
################################################################################
Expand Down
17 changes: 2 additions & 15 deletions builds/e2e/templates/e2e-run.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ steps:
# Flaky: Flaky on multiple platforms
# FlakyOnArm: Flaky only on arm
# FlakyOnNested: Flaky only on nested
# CentOsSafe: Can be run on CentOs
# SingleNodeOnly: Only applies to single-node cases
# NestedEdgeOnly: Only applies to nested edge cases
# NestedEdgeAmqpOnly: Only applies to nested edge cases using amqp upstream protocol
Expand All @@ -25,11 +24,7 @@ steps:
{
$filter += '&Name~TempSensor'
}
if ('$(artifactName)'.Contains('centos'))
{
$filter += '&Category=CentOsSafe'
}
elseif ('$(arch)' -eq 'arm32v7' -Or '$(arch)' -eq 'arm64v8')
if ('$(arch)' -eq 'arm32v7' -Or '$(arch)' -eq 'arm64v8')
{
$filter += '&Category!=FlakyOnArm'
$filter += '&Category!=Amd64Only'
Expand Down Expand Up @@ -68,15 +63,7 @@ steps:
$filter += '&Category!=NestedEdgeOnly'
}
#Dotnet SDK 3.1.415 package on Centos doesn't allow dotnet to be accessed via sudo command due to Path issues. Use the below workaround for centos only.
if ('$(artifactName)'.Contains('centos'))
{
sudo --preserve-env $(command -v dotnet) test $testFile --no-build --logger 'trx' --filter "$filter"
}
else
{
sudo --preserve-env dotnet test $testFile --no-build --logger 'trx' --filter "$filter"
}
sudo --preserve-env dotnet test $testFile --no-build --logger 'trx' --filter "$filter"
displayName: Run tests ${{ parameters.test_type }}
env:
Expand Down
2 changes: 1 addition & 1 deletion builds/mariner/SPECS/aziot-edge/aziot-edge.spec
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ make \
docdir=%{_docdir}/%{name} \
install-mariner

install -D contrib/centos/00-aziot-edged.preset %{buildroot}%{_presetdir}/00-aziot-edged.preset
install -D contrib/mariner/00-aziot-edged.preset %{buildroot}%{_presetdir}/00-aziot-edged.preset

%clean
rm -rf $RPM_BUILD_ROOT
Expand Down
51 changes: 1 addition & 50 deletions builds/misc/packages-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ resources:
type: github
endpoint: azure-iot-edge-iotedge1-github
name: azure/iot-identity-service
ref: release/1.4
ref: main

stages:
################################################################################
Expand All @@ -32,10 +32,6 @@ stages:
displayName: Linux
strategy:
matrix:
Centos75-amd64:
arch: amd64
os: centos7
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64
RedHat8-amd64:
arch: amd64
os: redhat8
Expand All @@ -45,19 +41,6 @@ stages:
os: redhat9
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64

Debian10-amd64:
os: debian10
arch: amd64
target.iotedged: edgelet/target/release
Debian10-arm32v7:
os: debian10
arch: arm32v7
target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release
Debian10-aarch64:
os: debian10
arch: aarch64
target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release

Debian11-amd64:
os: debian11
arch: amd64
Expand Down Expand Up @@ -211,17 +194,6 @@ stages:
displayName: Linux
strategy:
matrix:
# For ARM32 Debian10, we solely publishing iot-identity-service artifacts
# for the partner teams. We don't fully support edgelet upload because
# there is a known docker issue with debian 10.
Debian10-arm32v7:
excludeEdgelet: true
os: debian10
artifactName: iotedged-debian10-arm32v7
identityServiceArtifactName: packages_debian-10-slim_arm32v7
identityServicePackageFilter: aziot-identity-service_*_armhf.deb
pmcRepoName: microsoft-debian-buster-prod-apt
pmcRelease: buster
Debian11-arm32v7:
os: debian11
artifactName: iotedged-debian11-arm32v7
Expand Down Expand Up @@ -457,11 +429,6 @@ stages:
dependsOn: safe_guard
strategy:
matrix:
Centos75-amd64:
os: centos7
artifactName: iotedged-centos7-amd64
identityServiceArtifactName: packages_centos-7_amd64
identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm
RedHat8-amd64:
os: redhat8
artifactName: iotedged-redhat8-amd64
Expand All @@ -473,22 +440,6 @@ stages:
identityServiceArtifactName: packages_redhat-ubi9-latest_amd64
identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm

Debian10-amd64:
os: debian10
artifactName: iotedged-debian10-amd64
identityServiceArtifactName: packages_debian-10-slim_amd64
identityServicePackageFilter: aziot-identity-service*_amd64.deb
Debian10-arm32v7:
os: debian10
artifactName: iotedged-debian10-arm32v7
identityServiceArtifactName: packages_debian-10-slim_arm32v7
identityServicePackageFilter: aziot-identity-service*_armhf.deb
Debian10-aarch64:
os: debian10
artifactName: iotedged-debian10-aarch64
identityServiceArtifactName: packages_debian-10-slim_aarch64
identityServicePackageFilter: aziot-identity-service*_arm64.deb

Debian11-amd64:
os: debian11
artifactName: iotedged-debian11-amd64
Expand Down
19 changes: 1 addition & 18 deletions builds/misc/templates/build-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ stages:
- ImageOverride -equals agent-aziotedge-ubuntu-20.04-docker
strategy:
matrix:
Centos75-amd64:
arch: amd64
os: centos7
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64
RedHat8-amd64:
arch: amd64
os: redhat8
Expand All @@ -62,19 +58,6 @@ stages:
os: redhat9
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64

Debian10-amd64:
os: debian10
arch: amd64
target.iotedged: edgelet/target/release
Debian10-arm32v7:
os: debian10
arch: arm32v7
target.iotedged: edgelet/target/armv7-unknown-linux-gnueabihf/release
Debian10-aarch64:
os: debian10
arch: aarch64
target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release

Debian11-amd64:
os: debian11
arch: amd64
Expand Down Expand Up @@ -335,7 +318,7 @@ stages:
set -ex
git clone --recurse-submodules --branch main https://github.com/Azure/iot-identity-service.git
pushd iot-identity-service
packageVersion=$(git tag | grep 1.3.[0-9]*$ | sort --version-sort -r | head -1)
packageVersion=$(git tag | grep 1.5.[0-9]*$ | sort --version-sort -r | head -1)
sudo docker run --rm \
-v "$(Build.SourcesDirectory)/iot-identity-service:/src" \
-e "ARCH=$PACKAGE_ARCH" \
Expand Down
80 changes: 0 additions & 80 deletions builds/release/metrics-collector-images-publish.yaml

This file was deleted.

Loading

0 comments on commit c13dabb

Please sign in to comment.