Skip to content

Commit

Permalink
Add RHEL 9
Browse files Browse the repository at this point in the history
* Add RHEL 9

This change adds support for RHEL 9 by building packages in the CI build pipeline, running the end-to-end tests on an RHEL 9 agent, and building, signing, and publishing packages to packages.microsoft.com and our GitHub release pages.

I confirmed that the CI build produces RHEL 9 packages, that those packages can be installed on an RHEL 9 agent, and that all the end-to-end tests pass.

Co-authored-by: Micah Lewis <1009123+micahl@users.noreply.github.com>
  • Loading branch information
damonbarry and micahl committed Apr 26, 2023
1 parent 3bac802 commit 32f7481
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 36 deletions.
23 changes: 22 additions & 1 deletion builds/e2e/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,27 @@ jobs:
- template: templates/e2e-setup.yaml
- template: templates/e2e-run.yaml

################################################################################
- job: redhat9_amd64
################################################################################
displayName: RedHat9 amd64

pool:
name: $(pool.linux.name)
demands:
- ImageOverride -equals agent-aziotedge-rhel-9-msmoby

variables:
os: linux
arch: amd64
artifactName: iotedged-redhat9-amd64
identityServiceArtifactName: packages_redhat-ubi9-latest_amd64
identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm

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

################################################################################
- job: linux_amd64_proxy
################################################################################
Expand Down Expand Up @@ -357,4 +378,4 @@ jobs:

steps:
- template: templates/e2e-setup.yaml
- template: templates/e2e-run.yaml
- template: templates/e2e-run.yaml
26 changes: 20 additions & 6 deletions builds/misc/packages-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ stages:
arch: amd64
os: redhat8
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64
RedHat9-amd64:
arch: amd64
os: redhat9
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64

Debian10-amd64:
os: debian10
Expand All @@ -65,7 +69,7 @@ stages:
os: debian11
arch: aarch64
target.iotedged: edgelet/target/aarch64-unknown-linux-gnu/release

Ubuntu1804-amd64:
os: ubuntu18.04
arch: amd64
Expand Down Expand Up @@ -193,6 +197,11 @@ stages:
artifactName: iotedged-redhat8-amd64
identityServiceArtifactName: packages_redhat-ubi8-latest_amd64
identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm
RedHat9-amd64:
os: redhat9
artifactName: iotedged-redhat9-amd64
identityServiceArtifactName: packages_redhat-ubi9-latest_amd64
identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm

Ubuntu1804-amd64:
os: ubuntu18.04
Expand All @@ -204,7 +213,7 @@ stages:
artifactName: iotedged-ubuntu18.04-aarch64
identityServiceArtifactName: packages_ubuntu-18.04_aarch64
identityServicePackageFilter: aziot-identity-service_*_arm64.deb

Ubuntu2004-amd64:
os: ubuntu20.04
artifactName: iotedged-ubuntu20.04-amd64
Expand Down Expand Up @@ -305,7 +314,7 @@ stages:
scriptType: bash
scriptPath: $(Build.SourcesDirectory)/scripts/linux/publishReleasePackages.sh
arguments: -p $(os) -w $(System.ArtifactsDirectory) -d $(System.ArtifactsDirectory)/$(artifactName) -s $(package-server-name)

##############################################################################
- stage: PublishPackagesGithub
##############################################################################
Expand Down Expand Up @@ -374,7 +383,12 @@ stages:
artifactName: iotedged-redhat8-amd64
identityServiceArtifactName: packages_redhat-ubi8-latest_amd64
identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm

RedHat9-amd64:
os: redhat9
artifactName: iotedged-redhat9-amd64
identityServiceArtifactName: packages_redhat-ubi9-latest_amd64
identityServicePackageFilter: aziot-identity-service-*.x86_64.rpm

Debian10-amd64:
os: debian10
artifactName: iotedged-debian10-amd64
Expand All @@ -390,7 +404,7 @@ stages:
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 Expand Up @@ -618,4 +632,4 @@ stages:
test-released-images "$(Build.SourceBranchName)"
displayName: Released Images Smoke Tests
env:
DEVOPS_PAT: "$(IotEdge1-PAT-msazure)"
DEVOPS_PAT: "$(IotEdge1-PAT-msazure)"
4 changes: 4 additions & 0 deletions builds/misc/templates/build-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ stages:
arch: amd64
os: redhat8
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64
RedHat9-amd64:
arch: amd64
os: redhat9
target.iotedged: edgelet/target/rpmbuild/RPMS/x86_64

Debian10-amd64:
os: debian10
Expand Down
52 changes: 26 additions & 26 deletions edgelet/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 32f7481

Please sign in to comment.