Merge pull request #14658 from mozilla/try-ci-changes

fix(tests): Lower number of content-server test executors and increase instance size

.circleci/config.yml

@@ -140,7 +140,7 @@ commands:
         default: 0
       total:
         type: integer
-        default: 6
+        default: 3
     steps:
       - git-checkout
       - provision
@@ -354,24 +354,6 @@ jobs:
       - test-content-server-part:
           index: 2
 
-  test-content-server-3:
-    executor: functional-test-executor
-    steps:
-      - test-content-server-part:
-          index: 3
-
-  test-content-server-4:
-    executor: functional-test-executor
-    steps:
-      - test-content-server-part:
-          index: 4
-
-  test-content-server-5:
-    executor: functional-test-executor
-    steps:
-      - test-content-server-part:
-          index: 5
-
   # This job is manually triggered for now. see .circleci/README.md
   test-content-server-remote:
     parameters:
@@ -504,25 +486,6 @@ workflows:
               ignore: main
             tags:
               ignore: /.*/
-      - test-content-server-3:
-          filters:
-            branches:
-              ignore: main
-            tags:
-              ignore: /.*/
-      - test-content-server-4:
-          filters:
-            branches:
-              ignore: main
-            tags:
-              ignore: /.*/
-      - test-content-server-5:
-          filters:
-            branches:
-              ignore: main
-            tags:
-              ignore: /.*/
-
       - playwright-functional-tests:
           filters:
             branches:
@@ -616,24 +579,6 @@ workflows:
               ignore: /.*/
             tags:
               only: /.*/
-      - test-content-server-3:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /.*/
-      - test-content-server-4:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /.*/
-      - test-content-server-5:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /.*/
       - deploy-packages:
           executor: docker-build-executor
           filters:
@@ -647,6 +592,3 @@ workflows:
             - test-content-server-0
             - test-content-server-1
             - test-content-server-2
-            - test-content-server-3
-            - test-content-server-4
-            - test-content-server-5

packages/functional-tests/package.json

@@ -12,14 +12,14 @@
     "test-production": "playwright test --project=production"
   },
   "devDependencies": {
-    "@playwright/test": "^1.28.1",
+    "@playwright/test": "^1.29.0",
     "@types/upng-js": "^2",
     "fxa-auth-client": "workspace:*",
     "fxa-content-server": "workspace:*",
     "fxa-payments-server": "workspace:*",
     "fxa-settings": "workspace:*",
     "jsqr": "^1.4.0",
-    "playwright": "^1.25.2",
+    "playwright": "^1.29.0",
     "upng-js": "^2.1.0"
   }
 }

packages/fxa-content-server/scripts/test-ci.sh

@@ -46,10 +46,10 @@ npx pm2 ls
 
 cd packages/fxa-content-server
 
-test_suite circle 6
+test_suite circle 3
 
-# node 5 currently has the least work to do in the above tests
-if [[ "${CIRCLE_NODE_INDEX}" == "5" ]]; then
+# The last node currently has the least work to do in the above tests
+if [[ "${CIRCLE_NODE_INDEX}" == "2" ]]; then
   node tests/intern.js --suites='server' --output='../../artifacts/tests/server-results.xml'
   node tests/intern.js --suites='pairing' --output='../../artifacts/tests/pairing-results.xml'
 fi

yarn.lock

@@ -7175,15 +7175,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@playwright/test@npm:^1.28.1":
-  version: 1.28.1
-  resolution: "@playwright/test@npm:1.28.1"
+"@playwright/test@npm:^1.29.0":
+  version: 1.29.0
+  resolution: "@playwright/test@npm:1.29.0"
   dependencies:
     "@types/node": "*"
-    playwright-core: 1.28.1
+    playwright-core: 1.29.0
   bin:
     playwright: cli.js
-  checksum: dc39dfdf848171a6c65fc32a9dbc95162684a4a1e3401dd157d7d6822a065d8dcb96b2484fc3b223baea4da774450fddaeaa6d4d21546d17d45f01884fa8d7c5
+  checksum: ff7bd88c805348b80d28cd4d39ed31a3f2d645c5b87e791e49bf8ca60ec6d3e1db646ed351536d0f8c05902cca940c86f23dc5d37c1acaab994369a2ce2707f6
   languageName: node
   linkType: hard
 
@@ -24897,14 +24897,14 @@ fsevents@~2.1.1:
   version: 0.0.0-use.local
   resolution: "functional-tests@workspace:packages/functional-tests"
   dependencies:
-    "@playwright/test": ^1.28.1
+    "@playwright/test": ^1.29.0
     "@types/upng-js": ^2
     fxa-auth-client: "workspace:*"
     fxa-content-server: "workspace:*"
     fxa-payments-server: "workspace:*"
     fxa-settings: "workspace:*"
     jsqr: ^1.4.0
-    playwright: ^1.25.2
+    playwright: ^1.29.0
     upng-js: ^2.1.0
   languageName: unknown
   linkType: soft
@@ -37830,32 +37830,23 @@ fsevents@~2.1.1:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.25.2":
-  version: 1.25.2
-  resolution: "playwright-core@npm:1.25.2"
+"playwright-core@npm:1.29.0":
+  version: 1.29.0
+  resolution: "playwright-core@npm:1.29.0"
   bin:
     playwright: cli.js
-  checksum: 24ada61e2132bd7278cf0aa0ef711280e1519c437efa0088a99c47ef994202f4c9880521d8c0c51ab854bef08806f372477d754aac1e790ea64f18cd346b5b2f
+  checksum: 5e4b690b0b449ed27ab7f7d7c9bf778db53e6c6b37a8e7258fb070fe6e96f147ad5d66221a3953c9e4d0b2044b701c493d7a0708d7bdb6486e38a3518f62fdce
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.28.1":
-  version: 1.28.1
-  resolution: "playwright-core@npm:1.28.1"
-  bin:
-    playwright: cli.js
-  checksum: 8899e0d65de43ee10fadc171e0d48cd514bb574f3505478700094afa8a6e0dcd888a5c87af22acf31ebad455ada1327028909c42e20b8e25908b6255dc143bf0
-  languageName: node
-  linkType: hard
-
-"playwright@npm:^1.25.2":
-  version: 1.25.2
-  resolution: "playwright@npm:1.25.2"
+"playwright@npm:^1.29.0":
+  version: 1.29.0
+  resolution: "playwright@npm:1.29.0"
   dependencies:
-    playwright-core: 1.25.2
+    playwright-core: 1.29.0
   bin:
     playwright: cli.js
-  checksum: e500b45c2961140fdae665331d357ecf1cc308041e0fd8e6765b4da2195600a8a358d3e723bac6215bd9135979f7e7a350cdb1347f6cefa3773e85aa262ce879
+  checksum: e3b7dcefde55e53d62fab26d8c069bf76c93e7a2572272ea4d19e4fb6aa7451d386541faedf1140ba45e3f69f3e37b510492f5433cfbe084d4020d61722e103e
   languageName: node
   linkType: hard