test(plans): start the ported suites on Docker only

Plan the ported conformance suites on the Ubuntu rootful Docker environment, the
one the runner has already run on CI, and install Git only there. The Podman rpm
environments are defined and noted in the plan; add them after a first run.

Signed-off-by: Matthew Grossman <mgrossman@nvidia.com>

Author: matthewgrossman

tests/plans/cpu-tests.yaml

@@ -15,8 +15,8 @@
 # so a plan can use them once one exists.
 matrix:
   # Sandbox behavior through the SDK and the CLI. These tests are
-  # driver-agnostic, so every environment that has a Docker or Podman gateway
-  # the runner can wait for runs them. The Kubernetes (k3s) environments are
+  # driver-agnostic, so every environment with a gateway the runner can wait for
+  # can run them. Only Docker is planned until the others have run on CI. The Kubernetes (k3s) environments are
   # left out: before tests, the old lane verified that the Agent Sandbox
   # controller reconciles (tests/tmachine/ansible/playbooks/conformance/
   # k3s-ready.yaml), and the runner only waits for the gateway.
@@ -30,8 +30,10 @@ matrix:
       - policy-advisor
     environments:
       - tmachine.ubuntu2404-amd64.docker-rootful.deb
-      - tmachine.fedora44-amd64.podman-rootful.rpm
-      - tmachine.fedora44-amd64.podman-rootless.rpm
+      # The Podman rpm environments (tmachine.fedora44-amd64.podman-rootful.rpm
+      # and podman-rootless.rpm) ran the same tests in the old lane and are
+      # defined in tests/environments/, but the runner has not run them on CI.
+      # Add them here after a first run; they also need Git from test-tools.yaml.
   # OCI image behavior. The suite builds images with the gateway's container
   # engine, which the environment names in `env`. Only Docker names it so far.
   - type: conformance

tests/tmachine/config.nix

@@ -60,7 +60,6 @@ let
           use_galaxy = false;
           playbooks = [
             "ansible/playbooks/nextest.yaml"
-            "ansible/playbooks/test-tools.yaml"
             "ansible/playbooks/k3s.yaml"
           ];
         };
@@ -72,7 +71,6 @@ let
           use_galaxy = false;
           playbooks = [
             "ansible/playbooks/nextest.yaml"
-            "ansible/playbooks/test-tools.yaml"
             "ansible/playbooks/selinux.yaml"
             "ansible/playbooks/podman-rootful.yaml"
           ];
@@ -85,7 +83,6 @@ let
           use_galaxy = false;
           playbooks = [
             "ansible/playbooks/nextest.yaml"
-            "ansible/playbooks/test-tools.yaml"
             "ansible/playbooks/selinux.yaml"
             "ansible/playbooks/podman-rootless.yaml"
           ];