Repository navigation
test(conformance): run the conformance suite against a gateway that pushes configuration #5622
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
6e5bccd
3ab4245
9f230dd
6e54715
fee923c
3d3e07e
06e80a7
4d0495a
002bf18
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -206,6 +206,12 @@ description = "Run the testkit suites in tests/suites/conformance against a Dock | |
| depends = ["e2e:workload:build"] | ||
| run = "e2e/with-docker-gateway.sh cargo nextest run --locked --manifest-path tests/suites/conformance/Cargo.toml --workspace --test-threads 1 --no-fail-fast" | ||
|
|
||
| ["e2e:testkit:push"] | ||
| description = "Run the conformance suite against a Docker gateway that pushes configuration" | ||
| depends = ["e2e:workload:build"] | ||
| env = { OPENSHELL_CONFIG_DELIVERY_MODE = "push" } | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please reject a nonempty |
||
| run = "e2e/with-docker-gateway.sh cargo nextest run --locked --manifest-path tests/suites/conformance/Cargo.toml --workspace --test-threads 1 --no-fail-fast" | ||
|
|
||
| ["e2e:rust:push"] | ||
| description = "Run conformance and policy e2e tests against a Docker gateway that pushes configuration" | ||
| env = { OPENSHELL_CONFIG_DELIVERY_MODE = "push", OPENSHELL_E2E_DOCKER_FEATURES = "e2e-config-push", OPENSHELL_E2E_DOCKER_TEST = "config_push live_policy_update policy_activation" } | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| # Make the gateway push configuration to supervisors. | ||
| # | ||
| # Writes `[openshell.gateway] config_delivery_mode = "push"` to | ||
| # /etc/openshell-test/gateway-overrides.toml, which the `binaries`, `deb` and | ||
| # `rpm` installers apply to the gateway's configuration (k3s installers ignore | ||
| # it). | ||
| --- | ||
| - name: Gateway configuration push for tests | ||
| hosts: all | ||
| gather_facts: false | ||
| vars: | ||
| config_push_overrides: /etc/openshell-test/gateway-overrides.toml | ||
| tasks: | ||
| - name: Wait for SSH | ||
| ansible.builtin.wait_for_connection: | ||
|
|
||
| - name: Create the test configuration directory | ||
| become: true | ||
| ansible.builtin.file: | ||
| path: "{{ config_push_overrides | dirname }}" | ||
| state: directory | ||
| owner: root | ||
| group: root | ||
| mode: "0755" | ||
|
|
||
| # A managed block keeps tables that earlier playbooks wrote. Some writers | ||
| # replace the whole file: drivers/podman/userns.yaml and the cdi_fixtures | ||
| # role in environment setup, which must run before this playbook, and the | ||
| # openshell_external_driver role in the deb-external-docker-driver | ||
| # installer, which always runs after it, so don't pair that installer with | ||
| # this environment. | ||
| # | ||
| # TODO: https://github.com/NVIDIA/OpenShell/pull/5489 installs this file | ||
| # as a gateway.d drop-in config, which must declare `[openshell] | ||
| # version = 2`. When it lands, add that table here unless an earlier | ||
| # writer already does; TOML rejects a table defined twice. | ||
| - name: Write the configuration delivery mode | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Once #5780 lands, please switch this playbook to the shared |
||
| become: true | ||
| ansible.builtin.blockinfile: | ||
| path: "{{ config_push_overrides }}" | ||
| create: true | ||
| owner: root | ||
| group: root | ||
| mode: "0644" | ||
| marker: "# {mark} config-push.yaml" | ||
| block: | | ||
| [openshell.gateway] | ||
| config_delivery_mode = "push" | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please rerun
ubuntu-docker-rootful-config-push/debafter the rebase and confirm from the gateway log that a supervisor session actually negotiated push. If the installer drops the override, conformance can still pass in poll mode. Keep this environment name stable for #5792’sconfig_pushandpolicy_activationports; the ported push-session check can provide the lasting assertion. The row will pick upunsupported.yamlfrom main without extra wiring; only add a row-specific skip for a reproduced failure with a tracking issue.