Skip to content

Commit 6f33dea

Browse files
committed
ci: qualify Ubuntu branch installs with DEB packages
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent 236eab4 commit 6f33dea

2 files changed

Lines changed: 22 additions & 5 deletions

File tree

‎.github/workflows/branch-e2e.yml‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ jobs:
8989
timeout-minutes: 5
9090
outputs:
9191
cargo: ${{ steps.version.outputs.cargo }}
92+
deb_version: ${{ steps.version.outputs.deb_version }}
9293
rpm_version: ${{ steps.version.outputs.rpm_version }}
9394
rpm_release: ${{ steps.version.outputs.rpm_release }}
9495
steps:
@@ -101,10 +102,12 @@ jobs:
101102
id: version
102103
run: |
103104
cargo="$(python3 tasks/scripts/release.py get-version --cargo)"
105+
deb_version="$(python3 tasks/scripts/release.py get-version --dev --deb)"
104106
rpm_version="$(python3 tasks/scripts/release.py get-version --dev --rpm-version)"
105107
rpm_release="$(python3 tasks/scripts/release.py get-version --dev --rpm-release)"
106108
{
107109
echo "cargo=$cargo"
110+
echo "deb_version=$deb_version"
108111
echo "rpm_version=$rpm_version"
109112
echo "rpm_release=$rpm_release"
110113
} >> "$GITHUB_OUTPUT"
@@ -208,6 +211,18 @@ jobs:
208211
packages: write
209212
uses: ./.github/workflows/build-images.yml
210213

214+
build-deb:
215+
name: Build Debian packages
216+
needs: [pr_metadata, version, build-binaries, build-vm-driver]
217+
if: needs.pr_metadata.outputs.run_integration == 'true'
218+
permissions:
219+
contents: read
220+
packages: read
221+
uses: ./.github/workflows/deb-package.yml
222+
with:
223+
checkout-ref: ${{ github.sha }}
224+
deb-version: ${{ needs.version.outputs.deb_version }}
225+
211226
build-rpm:
212227
name: Build RPM packages
213228
needs: [pr_metadata, version, build-binaries]
@@ -223,14 +238,15 @@ jobs:
223238
cargo-version: ${{ needs.version.outputs.cargo }}
224239

225240
prepare-integration:
226-
needs: [pr_metadata, build-binaries, build-images, build-rpm]
241+
needs: [pr_metadata, build-binaries, build-images, build-deb, build-rpm]
227242
if: needs.pr_metadata.outputs.run_integration == 'true'
228243
permissions:
229244
actions: read
230245
contents: read
231246
packages: read
232247
uses: ./.github/workflows/prepare-integration-inputs.yml
233248
with:
249+
deb-artifact-name: deb-linux-amd64
234250
rpm-artifact-name: rpm-linux-x86_64
235251

236252
# Run driver-independent conformance tests.
@@ -247,7 +263,7 @@ jobs:
247263
integration-inputs-artifact-id: ${{ needs.prepare-integration.outputs.integration_inputs_artifact_id }}
248264
test-matrix: >-
249265
[
250-
{"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"conformance"},
266+
{"environment":"ubuntu-docker-rootful","installer":"deb","testsuite":"conformance"},
251267
{"environment":"ubuntu-k3s","installer":"k3s","testsuite":"conformance"},
252268
{"environment":"fedora-podman-rootful","installer":"rpm","testsuite":"conformance"},
253269
{"environment":"fedora-podman-rootless","installer":"rpm","testsuite":"conformance"}

‎CI.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ Main and manual runs also build release binaries, with `continue-on-error: true`
2424
so Windows failures do not fail the workflow.
2525

2626
Every approved `Branch E2E Checks` run builds the RPM packages, including
27-
runs without optional E2E labels. Core integration qualification installs the
28-
CLI and gateway RPMs on Fedora with rootful and rootless Podman and runs conformance using
29-
the matching runtime images. Release Dev and Release Tag run the same RPM lane.
27+
runs without optional E2E labels. Core integration qualification builds and installs
28+
the DEB on Ubuntu with Docker and installs the CLI and gateway RPMs on Fedora with
29+
rootful and rootless Podman. These lanes run conformance using the matching runtime
30+
images. Release Dev and Release Tag use the same package installers.
3031

3132
Three opt-in labels enable the long-running E2E suites:
3233

0 commit comments

Comments
 (0)