@@ -24,6 +24,24 @@ executors:
24
24
working_directory : ~/amplify-js
25
25
26
26
js-test-executor :
27
+ docker :
28
+ - image : cypress/included:12.4.1
29
+ - image : verdaccio/verdaccio
30
+ auth :
31
+ username : $DOCKERHUB_USERNAME
32
+ password : $DOCKERHUB_ACCESS_TOKEN
33
+ resource_class : large
34
+
35
+ # TODO: Update tests that use this image to use the updated `js-test-executor`
36
+ # After upgrading the Docker image to 12.4.1, we had to make several updates to our samples (see
37
+ # https://github.com/aws-amplify/amplify-js-samples-staging/pull/522).
38
+ # This is because our current implementation of setting network status in our E2E tests began to
39
+ # fail (i.e. this is no longer supported). We updated our samples to instead use the Reachability
40
+ # component's helper function for setting network status
41
+ # (see https://github.com/aws-amplify/amplify-js/blob/main/packages/core/src/Util/Reachability.ts#L42-L54).
42
+ # However, several JS tests were still failing after attempting to remediate. An item has been
43
+ # added to the JS backlog for follow-up.
44
+ js-test-executor-prev :
27
45
docker :
28
46
- image : cypress/included:8.7.0
29
47
- image : verdaccio/verdaccio
@@ -39,7 +57,7 @@ executors:
39
57
40
58
webkit-test-executor :
41
59
docker :
42
- - image : mcr.microsoft.com/playwright:v1.29.2 -focal
60
+ - image : mcr.microsoft.com/playwright:v1.30.0 -focal
43
61
- image : verdaccio/verdaccio
44
62
auth :
45
63
username : $DOCKERHUB_USERNAME
@@ -401,6 +419,7 @@ jobs:
401
419
echo $SSH_HOST_PUBLIC_KEY >> ~/.ssh/known_hosts
402
420
git clone $AMPLIFY_JS_SAMPLES_STAGING_URL
403
421
cd amplify-js-samples-staging
422
+ git checkout edge-testing-2
404
423
branchExists=true
405
424
git ls-remote --heads origin <<pipeline.git.branch>> | grep <<pipeline.git.branch>> >/dev/null || branchExists=false
406
425
if [ "$branchExists" = true ]; then git checkout <<pipeline.git.branch>>; fi
@@ -418,7 +437,8 @@ jobs:
418
437
parameters :
419
438
browser :
420
439
type : string
421
- executor : js-test-executor
440
+ # TODO: see `js-test-executor` TODO above
441
+ executor : js-test-executor-prev
422
442
<< : *test_env_vars
423
443
working_directory : ~/amplify-js-samples-staging/samples
424
444
steps :
@@ -448,7 +468,8 @@ jobs:
448
468
parameters :
449
469
browser :
450
470
type : string
451
- executor : js-test-executor
471
+ # TODO: see `js-test-executor` TODO above
472
+ executor : js-test-executor-prev
452
473
<< : *test_env_vars
453
474
working_directory : ~/amplify-js-samples-staging/samples
454
475
steps :
@@ -1353,7 +1374,8 @@ jobs:
1353
1374
browser : << parameters.browser >>
1354
1375
1355
1376
integ_react_iot_reconnect :
1356
- executor : js-test-executor
1377
+ # TODO: see `js-test-executor` TODO above
1378
+ executor : js-test-executor-prev
1357
1379
<< : *test_env_vars
1358
1380
working_directory : ~/amplify-js-samples-staging/samples/react/pubsub/reconnection-iot
1359
1381
steps :
@@ -1368,7 +1390,8 @@ jobs:
1368
1390
browser : chrome
1369
1391
1370
1392
integ_react_api_reconnect :
1371
- executor : js-test-executor
1393
+ # TODO: see `js-test-executor` TODO above
1394
+ executor : js-test-executor-prev
1372
1395
<< : *test_env_vars
1373
1396
working_directory : ~/amplify-js-samples-staging/samples/react/pubsub/reconnection-api
1374
1397
steps :
@@ -1515,7 +1538,7 @@ jobs:
1515
1538
git config --global user.name $GITHUB_USER
1516
1539
git status
1517
1540
git --no-pager diff
1518
- yarn publish:$CIRCLE_BRANCH
1541
+ # yarn publish:$CIRCLE_BRANCH
1519
1542
1520
1543
post_release :
1521
1544
executor : build-executor
@@ -1553,10 +1576,14 @@ releasable_branches: &releasable_branches
1553
1576
- 1.0-stable
1554
1577
- geo/main
1555
1578
- in-app-messaging/main
1579
+ - edge-testing-2
1556
1580
1557
1581
test_browsers : &test_browsers
1558
1582
browser : [chrome, firefox]
1559
1583
1584
+ all_test_browsers : &all_test_browsers
1585
+ browser : [chrome, firefox, edge]
1586
+
1560
1587
datastore_auth_scenarios : &datastore_auth_scenarios
1561
1588
scenario : [
1562
1589
owner-based-default, # TODO: Add `owner-based-operations` when tests pass
@@ -2007,7 +2034,7 @@ workflows:
2007
2034
<< : *releasable_branches
2008
2035
matrix :
2009
2036
parameters :
2010
- << : *test_browsers
2037
+ << : *all_test_browsers
2011
2038
- integ_react_datastore_custom_pk_unconnected_models_webkit :
2012
2039
requires :
2013
2040
- integ_setup
@@ -2040,7 +2067,7 @@ workflows:
2040
2067
<< : *releasable_branches
2041
2068
matrix :
2042
2069
parameters :
2043
- << : *test_browsers
2070
+ << : *all_test_browsers
2044
2071
- integ_react_datastore_background_process_manager_webkit :
2045
2072
requires :
2046
2073
- integ_setup
0 commit comments