@@ -100,11 +100,10 @@ type ServiceConnection = { host: string; port: number };
100100type ServiceConnections = Partial < Record < ServiceName , ServiceConnection > > ;
101101
102102/* ------------------------------------------------------------------ */
103- /* CI mode and skip logic */
103+ /* Skip logic */
104104/* ------------------------------------------------------------------ */
105105
106- const isCI = process . env . E2E_DOCKER_CI === "true" ;
107- const skipReason = isCI ? false : skipUnlessDocker ( ) ;
106+ const skipReason = skipUnlessDocker ( ) ;
108107
109108/* ------------------------------------------------------------------ */
110109/* Container lifecycle state */
@@ -128,35 +127,6 @@ const discoveredFixtures = await discoverFixtures();
128127
129128describe . skipIf ( skipReason ) ( "e2e-docker" , ( ) => {
130129 beforeAll ( async ( ) => {
131- if ( isCI ) {
132- // CI manages containers via GitHub Actions services
133- services = {
134- postgres : {
135- host : process . env . PG_HOST ?? "127.0.0.1" ,
136- port : Number ( process . env . PG_PORT ?? 5432 ) ,
137- } ,
138- mysql : {
139- host : process . env . MYSQL_HOST ?? "127.0.0.1" ,
140- port : Number ( process . env . MYSQL_PORT ?? 3306 ) ,
141- } ,
142- redis : {
143- host : process . env . REDIS_HOST ?? "127.0.0.1" ,
144- port : Number ( process . env . REDIS_PORT ?? 6379 ) ,
145- } ,
146- ssh : {
147- host : process . env . SSH_HOST ?? "127.0.0.1" ,
148- port : Number ( process . env . SSH_PORT ?? 2222 ) ,
149- } ,
150- } ;
151- internalAddresses = {
152- redis : {
153- host : process . env . REDIS_INTERNAL_HOST ?? "127.0.0.1" ,
154- port : Number ( process . env . REDIS_INTERNAL_PORT ?? 6379 ) ,
155- } ,
156- } ;
157- return ;
158- }
159-
160130 // Build custom images
161131 const sshdDockerfile = path . join (
162132 FIXTURES_ROOT ,
@@ -246,7 +216,6 @@ describe.skipIf(skipReason)("e2e-docker", () => {
246216 } , 180_000 ) ;
247217
248218 afterAll ( ( ) => {
249- if ( isCI ) return ;
250219 for ( const container of activeContainers ) {
251220 container . stop ( ) ;
252221 }
0 commit comments