Repository navigation
Conversation
…ushes configuration Add the ubuntu-docker-rootful-config-push tmachine environment. Its setup playbook, config-delivery.yaml, writes config_delivery_mode to the gateway overrides that the deb, rpm and binaries installers apply, and publishes the mode as OPENSHELL_TEST_CONFIG_DELIVERY_MODE. A push gateway lets a supervisor without push support keep polling, so the conformance suite passes in either mode. The new config-push feature suite fails unless the published mode is push and a new sandbox's supervisor reports a pushed-configuration session. E2E Suites runs the conformance family and the config-push suite in the new environment with the deb installer. mise run e2e:testkit:push runs both against a local Docker gateway in push mode. Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
The supervisor logs a pushed-configuration session only when the gateway accepted it with push enabled, so the config-push suite no longer also requires an OPENSHELL_TEST_CONFIG_DELIVERY_MODE variable. The environment's playbook, now config-push.yaml, sets push without a mode input, since polling is going away, and no longer writes an [openshell] table that a second overrides writer could duplicate. The test retries a failed `openshell logs` call until its timeout. e2e:testkit:push runs the push check before the conformance suite, so a conformance failure can't hide whether push was on. The TESTING.md section moves next to the tmachine runner docs instead of capturing the feature suite paragraphs that follow the gateway overrides section. Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
…teway-push-1d7bb5 Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com> # Conflicts: # .github/workflows/e2e-suites.yml # tests/suites/features/Cargo.toml # tests/tmachine/config.nix
|
🌿 Preview your docs: https://nvidia-preview-pr-5622.docs.buildwithfern.com/openshell |
|
Auto-sync is disabled for draft pull requests in this repository. Workflows must be run manually. Contributors can view more details about this message here. |
Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
A gateway built from this tree rejects unknown config fields and its supervisor always supports push, so the push conformance row already runs with push on unless the override file stops being merged. The separate suite cost a VM per E2E run for that one case. Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
… file Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
Signed-off-by: Piotr Mlocek <pmlocek@nvidia.com>
|
Label |
matthewgrossman
left a comment
There was a problem hiding this comment.
This merges cleanly into current main, but I’d rebase once #5780 lands so the push lane uses the shared gateway override role. The amd64 push row already passed on this PR head, so the PR description can drop the note that it hasn’t run in CI. The next run should verify push after the rebase.
| # 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 |
There was a problem hiding this comment.
Once #5780 lands, please switch this playbook to the shared gateway_overrides role with the config-push block name. That lets you remove the duplicate file-writing tasks and the warning about the other writers replacing the file. It also keeps the future gateway drop-in change in one place.
| {"environment":"fedora-podman-rootless","installer":"rpm","family":"conformance","package":"conformance","gateway":"openshell","runner":"ubuntu-24.04"}, | ||
| {"environment":"ubuntu-k3s","installer":"k3s","family":"conformance","package":"conformance","gateway":"tmachine","runner":"ubuntu-24.04"}, | ||
| {"environment":"ubuntu-k3s","installer":"k3s-ha","family":"conformance","package":"conformance","gateway":"tmachine","runner":"ubuntu-24.04"}, | ||
| {"environment":"ubuntu-docker-rootful-config-push","installer":"deb","family":"conformance","package":"conformance","gateway":"openshell","runner":"ubuntu-24.04"}, |
There was a problem hiding this comment.
Please rerun ubuntu-docker-rootful-config-push/deb after 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’s config_push and policy_activation ports; the ported push-session check can provide the lasting assertion. The row will pick up unsupported.yaml from main without extra wiring; only add a row-specific skip for a reproduced failure with a tracking issue.
| ["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" } |
There was a problem hiding this comment.
Please reject a nonempty OPENSHELL_GATEWAY_ENDPOINT here. The wrapper reuses that gateway instead of starting one, so setting this variable to push can silently test a polling gateway. Also consider using the shared Docker conformance helper so this local task picks up the Docker entries from unsupported.yaml.
Summary
Runs the full conformance suite in CI against a gateway with
config_delivery_mode = "push", ahead of making push the default in #4498.Related Issue
Refs #4498. No issue required: test and CI coverage only, no product behavior change.
Changes
ubuntu-docker-rootful-config-push:ubuntu-docker-rootfulplusplaybooks/config-push.yaml, which writesconfig_delivery_mode = "push"to/etc/openshell-test/gateway-overrides.toml. The deb, rpm and binaries installers already merge that file..github/workflows/e2e-suites.yml:conformancein the new environment with the deb installer.mise run e2e:testkit:pushruns conformance against a local Docker gateway withOPENSHELL_CONFIG_DELIVERY_MODE=push, for hosts without KVM.Nothing asserts push is in use. A typo in the setting fails gateway startup (unknown fields are rejected), and supervisors built from this tree always support push, so push is off only if the override file stops being merged. A separate evidence suite was tried and dropped as not worth a VM per E2E run.
Scope notes:
[openshell] version = 2.e2e/rust/tests/config_push.rswithe2e:rust:push, can go when feat(config)!: make push config delivery the default and remove supervisor polling #4498 makes push the default.Testing
mise run pre-commitpassesLocal results, before merging main:
ubuntu-docker-rootful-config-push+ deb: conformance 22/22 pass.config_push=true.The new CI row runs on amd64 and has not run in CI yet.
Checklist