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.

Sign up for GitHub

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

Jump to bottom

Ubuntu 24.04 support #266

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Ubuntu 24.04 support #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b50c051
drop xdp for ubuntu 22.04
ami-GS Aug 5, 2024
d6d4d1a
remove ubuntu24
ami-GS Aug 5, 2024
fc38da3
Ubuntu 24.04 support
ami-GS Aug 5, 2024
53fa2b2
fix
ami-GS Aug 5, 2024
faa7ef7
Merge branch 'dev/daiki/ubuntu22_noxdp' into dev/daiki/ubuntu24
ami-GS Aug 5, 2024
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
4 changes: 3 additions & 1 deletion .github/workflows/create-azure-machine.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ param (
[string]$Password,

[Parameter(Mandatory = $false)]
[ValidateSet("windows-2025", "windows-2022", "windows-2019", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "mariner-2")]
[ValidateSet("windows-2025", "windows-2022", "windows-2019", "ubuntu-24.04", "ubuntu-22.04", "ubuntu-20.04", "ubuntu-18.04", "mariner-2")]
[string]$Os = "windows-2022",

[Parameter(Mandatory = $false)]
Expand Down Expand Up @@ -48,6 +48,8 @@ if ($Os -eq "windows-2025") {
$image = "MicrosoftWindowsServer:WindowsServer:2022-datacenter-g2:latest"
} elseif ($Os -eq "windows-2019") {
$image = "MicrosoftWindowsServer:WindowsServer:2019-datacenter-gensecond:17763.5576.240304"
} elseif ($Os -eq "ubuntu-24.04") {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI this script has been re-purposed to be used as a manual utility tool for quickly spinning up a test VM using Azure CLI. We are rotating this out of the pipeline due to security reasons. We don't need to worry about updating this.

# ??
} elseif ($Os -eq "ubuntu-22.04") {
$image = "Canonical:0001-com-ubuntu-server-jammy:22_04-lts-gen2:22.04.202403010"
} elseif ($Os -eq "ubuntu-20.04") {
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/quic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ jobs:
tls: 'openssl'
- os: 'ubuntu-22.04'
tls: 'openssl3'
- os: 'ubuntu-24.04'
tls: 'openssl3'
xdp: '-UseXdp'
uses: microsoft/msquic/.github/workflows/build-reuse-unix.yml@main
with:
Expand Down Expand Up @@ -509,7 +511,7 @@ jobs:
run: echo "OS=$('${{runner.os}}'.ToLower())" >> $env:GITHUB_ENV
- name: Download Linux XDP Artifacts
uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d
if: ${{ matrix.os == 'ubuntu-22.04' }} # xdp build includes epoll io
if: ${{ matrix.os == 'ubuntu-24.04' }} # xdp build includes epoll io
with:
name: Release-${{env.OS}}-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-UseXdp-Perf
path: artifacts
Expand All @@ -521,7 +523,7 @@ jobs:
path: artifacts
- name: Download Artifacts
uses: actions/download-artifact@8caf195ad4b1dee92908e23f56eeb0696f1dd42d
if: ${{ matrix.os != 'ubuntu-22.04' }}
if: ${{ matrix.io != 'ubuntu-24.04' }}
with:
name: Release-${{env.OS}}-${{ matrix.os == 'windows-2025' && 'windows-2022' || matrix.os }}-${{ matrix.arch }}-${{ matrix.tls }}-Perf
path: artifacts
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/quic_matrix.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
{ "env": "lab", "os": "windows-2025", "arch": "x64", "tls": "schannel", "io": "wsk" },
{ "env": "lab", "os": "ubuntu-20.04", "arch": "x64", "tls": "openssl", "io": "epoll" },
{ "env": "lab", "os": "ubuntu-22.04", "arch": "x64", "tls": "openssl3", "io": "epoll" },
{ "env": "lab", "os": "ubuntu-22.04", "arch": "x64", "tls": "openssl3", "io": "xdp" }
{ "env": "lab", "os": "ubuntu-24.04", "arch": "x64", "tls": "openssl3", "io": "epoll" },
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First we need to onboard an Ubuntu 24.04 lab runner before we can merge this.

{ "env": "lab", "os": "ubuntu-24.04", "arch": "x64", "tls": "openssl3", "io": "xdp" }
]
Loading