refactor(tmachine): separate installation profiles

.github/workflows/branch-e2e.yml

@@ -223,9 +223,9 @@ jobs:
       integration-inputs-artifact-id: ${{ needs.prepare-integration.outputs.integration_inputs_artifact_id }}
       test-matrix: >-
         [
-          {"scenario":"ubuntu-docker-rootful","testsuite":"conformance"},
-          {"scenario":"fedora-podman-rootful","testsuite":"conformance"},
-          {"scenario":"fedora-podman-rootless","testsuite":"conformance"}
+          {"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"conformance"},
+          {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"conformance"},
+          {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"conformance"}
         ]
 
   # Run feature-specific integration tests:
@@ -242,8 +242,8 @@ jobs:
       integration-inputs-artifact-id: ${{ needs.prepare-integration.outputs.integration_inputs_artifact_id }}
       test-matrix: >-
         [
-          {"scenario":"fedora-podman-rootful","testsuite":"provider-refresh"},
-          {"scenario":"fedora-podman-rootless","testsuite":"provider-refresh"}
+          {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"provider-refresh"},
+          {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"provider-refresh"}
         ]
 
   # Run driver-specific integration tests:

.github/workflows/integration-runner.yml

@@ -19,14 +19,14 @@ on:
         required: false
         type: string
       test-matrix:
-        description: JSON array of scenario and testsuite combinations
+        description: JSON array of environment, installer, and testsuite combinations
         required: false
         type: string
         default: >-
           [
-            {"scenario":"ubuntu-docker-rootful","testsuite":"conformance"},
-            {"scenario":"fedora-podman-rootful","testsuite":"conformance"},
-            {"scenario":"fedora-podman-rootless","testsuite":"conformance"}
+            {"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"conformance"},
+            {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"conformance"},
+            {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"conformance"}
           ]
 
 permissions:
@@ -40,7 +40,7 @@ concurrency:
 
 jobs:
   integration:
-    name: Integration test (${{ inputs.category }}, ${{ matrix.scenario }}, ${{ matrix.testsuite }})
+    name: Integration test (${{ inputs.category }}, ${{ matrix.environment }}, ${{ matrix.installer }}, ${{ matrix.testsuite }})
     strategy:
       fail-fast: false
       matrix:
@@ -80,6 +80,7 @@ jobs:
 
       - name: Run test suite
         env:
-          SCENARIO: ${{ matrix.scenario }}
+          ENVIRONMENT: ${{ matrix.environment }}
+          INSTALLER: ${{ matrix.installer }}
           TESTSUITE: ${{ matrix.testsuite }}
-        run: nix run .#tmachine -- test "${SCENARIO}" "${TESTSUITE}"
+        run: nix run .#tmachine -- test "${ENVIRONMENT}" "${INSTALLER}" "${TESTSUITE}"

.github/workflows/integration-test.yml

@@ -17,14 +17,14 @@ on:
         type: string
         default: conformance
       test-matrix:
-        description: JSON array of scenario and testsuite combinations
+        description: JSON array of environment, installer, and testsuite combinations
         required: true
         type: string
         default: >-
           [
-            {"scenario":"ubuntu-docker-rootful","testsuite":"conformance"},
-            {"scenario":"fedora-podman-rootful","testsuite":"conformance"},
-            {"scenario":"fedora-podman-rootless","testsuite":"conformance"}
+            {"environment":"ubuntu-docker-rootful","installer":"binaries","testsuite":"conformance"},
+            {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"conformance"},
+            {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"conformance"}
           ]
 
 permissions:

.github/workflows/release-dev.yml

@@ -134,8 +134,8 @@ jobs:
       integration-inputs-artifact-id: ${{ needs.prepare-integration.outputs.integration_inputs_artifact_id }}
       test-matrix: >-
         [
-          {"scenario":"fedora-podman-rootful","testsuite":"provider-refresh"},
-          {"scenario":"fedora-podman-rootless","testsuite":"provider-refresh"}
+          {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"provider-refresh"},
+          {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"provider-refresh"}
         ]
 
   docker-e2e:

.github/workflows/release-tag.yml

@@ -162,8 +162,8 @@ jobs:
       integration-inputs-artifact-id: ${{ needs.prepare-integration.outputs.integration_inputs_artifact_id }}
       test-matrix: >-
         [
-          {"scenario":"fedora-podman-rootful","testsuite":"provider-refresh"},
-          {"scenario":"fedora-podman-rootless","testsuite":"provider-refresh"}
+          {"environment":"fedora-podman-rootful","installer":"binaries","testsuite":"provider-refresh"},
+          {"environment":"fedora-podman-rootless","installer":"binaries","testsuite":"provider-refresh"}
         ]
 
   docker-e2e:

architecture/build.md

@@ -263,12 +263,18 @@ dependencies after installation. The Keycloak provider-refresh suite starts a
 guest-local Keycloak realm and verifies a successful OAuth refresh followed by
 revocation and the gateway's reauthorization-required recovery state.
 
-The `tests/tmachine` setup and installation caches include a digest of the
+Tmachine environments define the guest machine and runtime setup, while named
+installers define how OpenShell is installed. This keeps the runtime mode
+independent from binary or package installation and lets multiple installers
+reuse the same prepared setup disk. The test command is
+`tmachine test <environment> <installer> <testsuite>`.
+
+The `tests/tmachine` setup and install caches include a digest of the
 entire directory containing `ANSIBLE_CONFIG`, including local roles, task
 includes, templates, inventory, and requirements. The digest uses sorted
 relative paths, file contents, and executable permissions; source symlinks
 are unsupported. Both keys also retain the ordered playbook paths and contents,
-their base disk contents, and whether Galaxy is enabled; installation keys
+their base disk contents, and whether Galaxy is enabled; install keys
 include named binary inputs. The top-level `.roles` directory is excluded:
 Galaxy release pins in `requirements.yaml` are treated as immutable, including
 any transitive dependency pins. Cache misses with Galaxy enabled reinstall
@@ -279,7 +285,7 @@ with musl, and the gateway and supervisor with GNU. Image assembly stages
 the gateway, sandbox, and supervisor as separate binaries for their respective
 Dockerfiles. The helpers stage binaries under `artifacts/binaries` so local and
 CI builds expose the same inputs to tmachine and image assembly. The Ubuntu
-Docker and Fedora Podman scenarios import both local runtime images and
+Docker and Fedora Podman environments import both local runtime images and
 configure the gateway to use them.
 
 ## Python Wheel Packaging

tests/config.nix

@@ -31,7 +31,7 @@ let
       }
     ];
 
-    scenarios = [
+    environments = [
       {
         name = "ubuntu-docker-rootful";
         machine = "ubuntu";
@@ -42,19 +42,6 @@ let
             "ansible/playbooks/docker.yaml"
           ];
         };
-        install = {
-          use_galaxy = false;
-          playbooks = [
-            "ansible/playbooks/openshell.yaml"
-            "ansible/playbooks/gateway.yaml"
-          ];
-          inputs = {
-            openshell_cli_binary = "../artifacts/binaries/${muslTarget}/openshell";
-            openshell_gateway_binary = "../artifacts/binaries/${gnuTarget}/openshell-gateway";
-            openshell_supervisor_image = "../artifacts/images/openshell-supervisor-tmachine.tar";
-            openshell_sandbox_image = "../artifacts/images/openshell-sandbox-tmachine.tar";
-          };
-        };
       }
       {
         name = "fedora-podman-rootful";
@@ -67,19 +54,6 @@ let
             "ansible/playbooks/podman-rootful.yaml"
           ];
         };
-        install = {
-          use_galaxy = false;
-          playbooks = [
-            "ansible/playbooks/openshell.yaml"
-            "ansible/playbooks/gateway.yaml"
-          ];
-          inputs = {
-            openshell_cli_binary = "../artifacts/binaries/${muslTarget}/openshell";
-            openshell_gateway_binary = "../artifacts/binaries/${gnuTarget}/openshell-gateway";
-            openshell_supervisor_image = "../artifacts/images/openshell-supervisor-tmachine.tar";
-            openshell_sandbox_image = "../artifacts/images/openshell-sandbox-tmachine.tar";
-          };
-        };
       }
       {
         name = "fedora-podman-rootless";
@@ -92,18 +66,22 @@ let
             "ansible/playbooks/podman-rootless.yaml"
           ];
         };
-        install = {
-          use_galaxy = false;
-          playbooks = [
-            "ansible/playbooks/openshell.yaml"
-            "ansible/playbooks/gateway.yaml"
-          ];
-          inputs = {
-            openshell_cli_binary = "../artifacts/binaries/${muslTarget}/openshell";
-            openshell_gateway_binary = "../artifacts/binaries/${gnuTarget}/openshell-gateway";
-            openshell_supervisor_image = "../artifacts/images/openshell-supervisor-tmachine.tar";
-            openshell_sandbox_image = "../artifacts/images/openshell-sandbox-tmachine.tar";
-          };
+      }
+    ];
+
+    installers = [
+      {
+        name = "binaries";
+        use_galaxy = false;
+        playbooks = [
+          "ansible/playbooks/openshell.yaml"
+          "ansible/playbooks/gateway.yaml"
+        ];
+        inputs = {
+          openshell_cli_binary = "../artifacts/binaries/${muslTarget}/openshell";
+          openshell_gateway_binary = "../artifacts/binaries/${gnuTarget}/openshell-gateway";
+          openshell_supervisor_image = "../artifacts/images/openshell-supervisor-tmachine.tar";
+          openshell_sandbox_image = "../artifacts/images/openshell-sandbox-tmachine.tar";
         };
       }
     ];

tests/tmachine/src/config.rs

@@ -10,7 +10,8 @@ use serde::Deserialize;
 #[derive(Clone, Deserialize)]
 pub struct Config {
     pub machines: Vec<Machine>,
-    pub scenarios: Vec<Scenario>,
+    pub environments: Vec<Environment>,
+    pub installers: Vec<Installer>,
     pub testsuites: Vec<Testsuite>,
 }
 
@@ -21,11 +22,10 @@ pub struct Machine {
 }
 
 #[derive(Clone, Deserialize)]
-pub struct Scenario {
+pub struct Environment {
     pub name: String,
     pub machine: String,
     pub setup: Setup,
-    pub install: Install,
 }
 
 #[derive(Clone, Deserialize)]
@@ -35,7 +35,8 @@ pub struct Setup {
 }
 
 #[derive(Clone, Deserialize)]
-pub struct Install {
+pub struct Installer {
+    pub name: String,
     pub use_galaxy: bool,
     pub playbooks: Vec<PathBuf>,
     pub inputs: BTreeMap<String, PathBuf>,

tests/tmachine/src/main.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 
 use anyhow::{Context, Result};
 use clap::{Parser, Subcommand};
-use config::{Config, Machine, Scenario};
+use config::{Config, Environment, Installer, Machine};
 
 mod ansible;
 mod config;
@@ -23,9 +23,18 @@ struct Cli {
 
 #[derive(Subcommand)]
 enum Command {
-    Setup { scenario: String },
-    Install { scenario: String },
-    Test { scenario: String, testsuite: String },
+    Setup {
+        environment: String,
+    },
+    Install {
+        environment: String,
+        installer: String,
+    },
+    Test {
+        environment: String,
+        installer: String,
+        testsuite: String,
+    },
 }
 
 #[tokio::main(flavor = "current_thread")]
@@ -34,49 +43,64 @@ async fn main() -> Result<()> {
     let config = Config::load(&cli.config)?;
 
     match cli.command {
-        Command::Setup { scenario } => {
-            let (machine, scenario) = find_scenario(&config, &scenario)?;
-            qemu::setup(&machine, &scenario).await?;
+        Command::Setup { environment } => {
+            let (machine, environment) = find_environment(&config, &environment)?;
+            qemu::setup(&machine, &environment).await?;
         }
-        Command::Install { scenario } => {
-            let (machine, scenario) = find_scenario(&config, &scenario)?;
-            qemu::install(&machine, &scenario).await?;
+        Command::Install {
+            environment,
+            installer,
+        } => {
+            let (machine, environment) = find_environment(&config, &environment)?;
+            let installer = find_installer(&config, &installer)?;
+            qemu::install(&machine, &environment, &installer).await?;
         }
         Command::Test {
-            scenario,
+            environment,
+            installer,
             testsuite,
         } => {
-            let (machine, scenario) = find_scenario(&config, &scenario)?;
+            let (machine, environment) = find_environment(&config, &environment)?;
+            let installer = find_installer(&config, &installer)?;
             let testsuite = config
                 .testsuites
                 .iter()
                 .find(|candidate| candidate.name == testsuite)
                 .with_context(|| format!("testsuite {testsuite:?} is not defined"))?;
-            qemu::test(&machine, &scenario, testsuite).await?;
+            qemu::test(&machine, &environment, &installer, testsuite).await?;
         }
     }
 
     Ok(())
 }
 
-fn find_scenario(config: &Config, name: &str) -> Result<(Machine, Scenario)> {
-    let scenario = config
-        .scenarios
+fn find_installer(config: &Config, name: &str) -> Result<Installer> {
+    config
+        .installers
+        .iter()
+        .find(|installer| installer.name == name)
+        .with_context(|| format!("installer {name:?} is not defined"))
+        .cloned()
+}
+
+fn find_environment(config: &Config, name: &str) -> Result<(Machine, Environment)> {
+    let environment = config
+        .environments
         .iter()
-        .find(|scenario| scenario.name == name)
-        .with_context(|| format!("scenario {name:?} is not defined"))?
+        .find(|environment| environment.name == name)
+        .with_context(|| format!("environment {name:?} is not defined"))?
         .clone();
     let machine = config
         .machines
         .iter()
-        .find(|machine| machine.name == scenario.machine)
+        .find(|machine| machine.name == environment.machine)
         .with_context(|| {
             format!(
-                "machine {:?} referenced by scenario {:?} is not defined",
-                scenario.machine, scenario.name
+                "machine {:?} referenced by environment {:?} is not defined",
+                environment.machine, environment.name
             )
         })?
         .clone();
 
-    Ok((machine, scenario))
+    Ok((machine, environment))
 }