Skip to content

Commit 642c190

Browse files
committed
ci(tmachine): run feature suites in GitHub Actions
Signed-off-by: Evan Lezar <elezar@nvidia.com>
1 parent 97a2c92 commit 642c190

5 files changed

Lines changed: 204 additions & 195 deletions

File tree

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,21 @@ jobs:
278278
conformance-artifact-prefix: openshell-conformance
279279

280280
podman-e2e:
281-
needs: [pr_metadata, build-cli, build-conformance, build-gateway, build-sandbox-image, build-supervisor-image]
281+
needs: [pr_metadata, build-cli, build-gateway, build-sandbox-image, build-supervisor-image]
282282
if: needs.pr_metadata.outputs.should_run == 'true' && needs.pr_metadata.outputs.run_core_e2e == 'true'
283283
permissions:
284284
actions: read
285285
contents: read
286286
packages: read
287-
uses: ./.github/workflows/e2e-podman-test.yml
287+
uses: ./.github/workflows/tmachine-test.yml
288288
with:
289-
image-tag: ${{ github.sha }}
290-
conformance-artifact-prefix: openshell-conformance
289+
test-matrix: >-
290+
[
291+
{
292+
"scenario":"fedora-podman-rootful",
293+
"testsuite":"provider-refresh"
294+
}
295+
]
291296
292297
vm-e2e:
293298
needs: [pr_metadata, build-cli, build-conformance, build-gateway, build-vm-driver]

‎.github/workflows/conformance.yml‎

Lines changed: 0 additions & 177 deletions
This file was deleted.

‎.github/workflows/release-dev.yml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,20 @@ jobs:
175175
conformance-artifact-prefix: openshell-conformance
176176

177177
podman-e2e:
178-
needs: [build-cli, build-conformance, build-gateway, build-sandbox-image, build-supervisor-image]
178+
needs: [build-cli, build-gateway, build-sandbox-image, build-supervisor-image]
179179
permissions:
180180
actions: read
181181
contents: read
182182
packages: read
183-
uses: ./.github/workflows/e2e-podman-test.yml
183+
uses: ./.github/workflows/tmachine-test.yml
184184
with:
185-
image-tag: ${{ github.sha }}
186-
conformance-artifact-prefix: openshell-conformance
185+
test-matrix: >-
186+
[
187+
{
188+
"scenario":"fedora-podman-rootful",
189+
"testsuite":"provider-refresh"
190+
}
191+
]
187192
188193
vm-e2e:
189194
needs: [build-cli, build-conformance, build-gateway, build-vm-driver]
@@ -195,6 +200,14 @@ jobs:
195200
with:
196201
conformance-artifact-prefix: openshell-conformance
197202

203+
conformance:
204+
needs: [build-cli, build-gateway, build-sandbox-image, build-supervisor-image]
205+
permissions:
206+
actions: read
207+
contents: read
208+
packages: read
209+
uses: ./.github/workflows/tmachine-test.yml
210+
198211
tag-ghcr-dev:
199212
name: Tag GHCR Images as Dev
200213
needs: [build-gateway-image, build-sandbox-image, build-supervisor-image, release-dev]
@@ -419,7 +432,7 @@ jobs:
419432
# ---------------------------------------------------------------------------
420433
release-dev:
421434
name: Release Dev
422-
needs: [compute-versions, package-binaries, build-python-wheel, docker-e2e, podman-e2e, vm-e2e, build-deb, build-rpm, build-snap, smoke-linux-dev-artifacts]
435+
needs: [compute-versions, package-binaries, build-python-wheel, docker-e2e, podman-e2e, vm-e2e, conformance, build-deb, build-rpm, build-snap, smoke-linux-dev-artifacts]
423436
runs-on: linux-amd64-cpu8
424437
timeout-minutes: 10
425438
permissions:

‎.github/workflows/release-tag.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,28 +213,32 @@ jobs:
213213
runner: linux-arm64-cpu8
214214
conformance-artifact-prefix: openshell-conformance
215215

216-
podman-e2e:
217-
needs: [compute-versions, build-cli, build-conformance, build-gateway, build-sandbox-image, build-supervisor-image]
216+
vm-e2e:
217+
needs: [compute-versions, build-cli, build-conformance, build-gateway, build-vm-driver]
218218
permissions:
219219
actions: read
220220
contents: read
221221
packages: read
222-
uses: ./.github/workflows/e2e-podman-test.yml
222+
uses: ./.github/workflows/e2e-vm-test.yml
223223
with:
224-
image-tag: ${{ needs.compute-versions.outputs.source_sha }}
225224
checkout-ref: ${{ inputs.tag || github.ref }}
226225
conformance-artifact-prefix: openshell-conformance
227226

228-
vm-e2e:
229-
needs: [compute-versions, build-cli, build-conformance, build-gateway, build-vm-driver]
227+
podman-e2e:
228+
needs: [compute-versions, build-cli, build-gateway, build-sandbox-image, build-supervisor-image]
230229
permissions:
231230
actions: read
232231
contents: read
233232
packages: read
234-
uses: ./.github/workflows/e2e-vm-test.yml
233+
uses: ./.github/workflows/tmachine-test.yml
235234
with:
236-
checkout-ref: ${{ inputs.tag || github.ref }}
237-
conformance-artifact-prefix: openshell-conformance
235+
test-matrix: >-
236+
[
237+
{
238+
"scenario":"fedora-podman-rootful",
239+
"testsuite":"provider-refresh"
240+
}
241+
]
238242
239243
tag-ghcr-release:
240244
name: Tag GHCR Images

0 commit comments

Comments
 (0)