@@ -245,8 +245,8 @@ impl JobArchetype for StandardLibraryTests {
245
245
let graal_edition = self . graal_edition ;
246
246
let should_enable_cloud_tests = self . cloud_tests_enabled ;
247
247
let job_name = format ! ( "Standard Library Tests ({graal_edition})" ) ;
248
- let mut job = RunStepsBuilder :: new ( "backend test standard-library" )
249
- . customize ( move |step| {
248
+ let run_steps_builder =
249
+ RunStepsBuilder :: new ( "backend test standard-library" ) . customize ( move |step| {
250
250
let main_step = step
251
251
. with_secret_exposed_as (
252
252
secret:: ENSO_LIB_S3_AWS_REGION ,
@@ -268,9 +268,14 @@ impl JobArchetype for StandardLibraryTests {
268
268
} ;
269
269
270
270
vec ! [ updated_main_step, step:: stdlib_test_reporter( target, graal_edition) ]
271
- } )
272
- . build_job ( job_name, target)
273
- . with_permission ( Permission :: Checks , Access :: Write ) ;
271
+ } ) ;
272
+ let mut job = build_job_ensuring_cloud_tests_run_on_github (
273
+ run_steps_builder,
274
+ target,
275
+ & job_name,
276
+ should_enable_cloud_tests,
277
+ )
278
+ . with_permission ( Permission :: Checks , Access :: Write ) ;
274
279
match graal_edition {
275
280
graalvm:: Edition :: Community => job. env ( env:: GRAAL_EDITION , graalvm:: Edition :: Community ) ,
276
281
graalvm:: Edition :: Enterprise =>
@@ -288,6 +293,26 @@ impl JobArchetype for StandardLibraryTests {
288
293
}
289
294
}
290
295
296
+ /** This is a temporary workaround.
297
+ *
298
+ * The Cloud tests preparation requires `aws` CLI to be installed on the machine.
299
+ * The GitHub hosted runners have it, but our self-hosted runners do not.
300
+ * To fix this we either need to modify self-hosted runners to provide the AWS CLI or change the
301
+ * way we prepare the Cloud tests to not require it.
302
+ */
303
+ fn build_job_ensuring_cloud_tests_run_on_github (
304
+ run_steps_builder : RunStepsBuilder ,
305
+ target : Target ,
306
+ job_name : & str ,
307
+ cloud_tests_enabled : bool ,
308
+ ) -> Job {
309
+ if cloud_tests_enabled {
310
+ run_steps_builder. build_job ( job_name, RunnerLabel :: LinuxLatest )
311
+ } else {
312
+ run_steps_builder. build_job ( job_name, target)
313
+ }
314
+ }
315
+
291
316
#[ derive( Clone , Copy , Debug ) ]
292
317
pub struct SnowflakeTests { }
293
318
@@ -324,10 +349,13 @@ impl JobArchetype for SnowflakeTests {
324
349
crate :: libraries_tests:: snowflake:: env:: ENSO_SNOWFLAKE_WAREHOUSE ,
325
350
) ;
326
351
327
- let updated_main_step = enable_cloud_tests ( main_step) ;
352
+ // Temporarily disabled until we can get the Cloud auth fixed.
353
+ // Snowflake does not rely on cloud anyway, so it can be disabled.
354
+ // But it will rely once we add datalink tests, so this should be fixed soon.
355
+ // let updated_main_step = enable_cloud_tests(main_step);
328
356
329
357
vec ! [
330
- updated_main_step ,
358
+ main_step ,
331
359
step:: extra_stdlib_test_reporter( target, GRAAL_EDITION_FOR_EXTRA_TESTS ) ,
332
360
]
333
361
} )
0 commit comments