Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/e2e-suites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ jobs:
{"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"},
{"environment":"ubuntu-docker-rootful-cdi","installer":"deb","family":"features","package":"cdi","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootful-cdi","installer":"rpm","family":"features","package":"cdi","gateway":"openshell","runner":"ubuntu-24.04"},
{"environment":"fedora-podman-rootless-cdi","installer":"rpm","family":"features","package":"cdi","gateway":"openshell","runner":"ubuntu-24.04"},
Expand Down
6 changes: 6 additions & 0 deletions tasks/test.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
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" }
Expand Down
51 changes: 51 additions & 0 deletions tests/tmachine/ansible/playbooks/config-push.yaml
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
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"
6 changes: 6 additions & 0 deletions tests/tmachine/config.nix
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ let
bases = dockerBases ++ podmanBases;
setup.playbooks = [ "ansible/playbooks/cdi.yaml" ];
};
# A gateway that pushes configuration to supervisors
# (`config_delivery_mode = "push"`), for the conformance family.
config-push = {
bases = dockerBases;
setup.playbooks = [ "ansible/playbooks/config-push.yaml" ];
};
};
featureEnvironments = pkgs.lib.concatMap (
feature: map (base: withSetup base feature features.${feature}.setup) features.${feature}.bases
Expand Down
Loading