|
24 | 24 | package, |
25 | 25 | target, |
26 | 26 | output, |
| 27 | + features ? null, |
| 28 | + filter ? "kind(test)", |
27 | 29 | }: |
28 | 30 | pkgs.writeShellApplication { |
29 | 31 | name = "build-${name}-test-archive"; |
|
56 | 58 | --manifest-path "$manifest_path" \ |
57 | 59 | --target ${target} \ |
58 | 60 | -p ${package} \ |
59 | | - -E 'kind(test)' \ |
| 61 | + ${pkgs.lib.optionalString (features != null) "--features ${pkgs.lib.escapeShellArg features}"} \ |
| 62 | + -E ${pkgs.lib.escapeShellArg filter} \ |
60 | 63 | --archive-file "$bundle_dir/tests.tar.zst" |
61 | 64 |
|
62 | 65 | cd "$workspace_root" |
|
92 | 95 | target = muslToolchain.target; |
93 | 96 | output = "artifacts/test-archives/${muslToolchain.target}/provider-refresh-keycloak-tests.tar"; |
94 | 97 | }; |
| 98 | + |
| 99 | + # Follow-up: migrate these wrapper-coupled tests once tmachine provides their |
| 100 | + # managed-gateway controls, SPIFFE fixtures, caller driver-config setting, |
| 101 | + # guest tools, and matching workload-image identity behavior. The corporate |
| 102 | + # proxy and gateway-start binaries currently self-skip without wrapper-owned |
| 103 | + # gateway metadata, so exclude them rather than report false passes. The |
| 104 | + # dedicated driver-podman suite retains user-namespace coverage. |
| 105 | + podmanE2eExcludedBinaries = [ |
| 106 | + "credential_gating" |
| 107 | + "driver_config_volume" |
| 108 | + "forward_proxy_graphql_l7" |
| 109 | + "forward_proxy_jsonrpc_l7" |
| 110 | + "forward_proxy_l7_bypass" |
| 111 | + "host_gateway_alias" |
| 112 | + "landlock" |
| 113 | + "local_driver_token_restart" |
| 114 | + # Standalone tmachine runs can time out while opening the localhost relay. |
| 115 | + # Follow up on making the relay setup deterministic before restoring it. |
| 116 | + "no_proxy" |
| 117 | + "podman_corporate_proxy" |
| 118 | + "podman_gateway_start" |
| 119 | + "podman_oci_identity" |
| 120 | + "podman_userns" |
| 121 | + "provider_auto_create" |
| 122 | + "provider_refresh_handles" |
| 123 | + "provider_token_exchange" |
| 124 | + "proxy_egress_pipeline" |
| 125 | + # Nextest archive filters cannot select individual tests. These binaries |
| 126 | + # contain both passing cases and cases that need guest tools (`script` and |
| 127 | + # `git`), so keep the complete binaries in the follow-up bucket. |
| 128 | + "sandbox_lifecycle" |
| 129 | + "sync" |
| 130 | + # Needs a prebuilt musl DNS probe in guest artifact mode; tracked in #3009. |
| 131 | + "transparent_tcp" |
| 132 | + "websocket_conformance" |
| 133 | + "workspace_lifecycle" |
| 134 | + ]; |
| 135 | + podmanE2eArchiveFilter = |
| 136 | + let |
| 137 | + excludedBinaries = map (binary: "binary(=${binary})") podmanE2eExcludedBinaries; |
| 138 | + in |
| 139 | + "kind(test) and not (${pkgs.lib.concatStringsSep " or " excludedBinaries})"; |
| 140 | + |
95 | 141 | podmanDriverArchive = mkTestArchive { |
96 | 142 | name = "podman-driver"; |
97 | 143 | workspacePath = "tests/suites/drivers"; |
|
100 | 146 | target = muslToolchain.target; |
101 | 147 | output = "artifacts/test-archives/${muslToolchain.target}/openshell-podman-tests.tar"; |
102 | 148 | }; |
| 149 | + podmanE2eArchive = mkTestArchive { |
| 150 | + name = "podman-e2e"; |
| 151 | + workspacePath = "e2e/rust"; |
| 152 | + manifestPath = "e2e/rust/Cargo.toml"; |
| 153 | + package = "openshell-e2e"; |
| 154 | + target = muslToolchain.target; |
| 155 | + output = "artifacts/test-archives/${muslToolchain.target}/openshell-podman-e2e-tests.tar"; |
| 156 | + features = "e2e-podman"; |
| 157 | + filter = podmanE2eArchiveFilter; |
| 158 | + }; |
103 | 159 | in |
104 | 160 | rec { |
105 | | - inherit conformanceCliArchive providerRefreshKeycloakArchive podmanDriverArchive; |
| 161 | + inherit |
| 162 | + conformanceCliArchive |
| 163 | + providerRefreshKeycloakArchive |
| 164 | + podmanDriverArchive |
| 165 | + podmanE2eArchive |
| 166 | + ; |
106 | 167 |
|
107 | 168 | binaries = pkgs.writeShellApplication { |
108 | 169 | name = "build-artifacts-binaries"; |
@@ -148,17 +209,20 @@ rec { |
148 | 209 | conformanceCliArchive |
149 | 210 | providerRefreshKeycloakArchive |
150 | 211 | podmanDriverArchive |
| 212 | + podmanE2eArchive |
151 | 213 | ]; |
152 | 214 | text = '' |
153 | 215 | build-openshell-conformance-test-archive |
154 | 216 | build-provider-refresh-keycloak-test-archive |
155 | 217 | build-podman-driver-test-archive |
| 218 | + build-podman-e2e-test-archive |
156 | 219 | ''; |
157 | 220 | }; |
158 | 221 |
|
159 | 222 | images = pkgs.writeShellApplication { |
160 | 223 | name = "build-artifacts-images"; |
161 | 224 | runtimeInputs = [ |
| 225 | + pkgs.coreutils |
162 | 226 | pkgs.docker-client |
163 | 227 | pkgs.git |
164 | 228 | ]; |
|
0 commit comments