Merge branch 'nz-non-auxia-sign-in-gate' of github.com:guardian/dotcom-rendering into nz-non-auxia-sign-in-gate

Author: Juarez Mota

.github/workflows/container-production.yml

@@ -39,7 +39,7 @@ jobs:
       - name: Build image
         run: docker buildx build --platform linux/arm64 -f Production.dockerfile -t ${{ github.repository }}:latest .
       - name: Publish Image
-        uses: guardian/actions-publish-image@v0.0.7
+        uses: guardian/actions-publish-image@v0.0.8
         id: publish-image
         with:
           roleArn: ${{ secrets.GU_ARTIFACTS_ROLE_ARN }}

ab-testing/config/abTests.ts

@@ -144,6 +144,26 @@ const ABTests: ABTest[] = [
 		groups: ["control", "variant"],
 		shouldForceMetricsCollection: false,
 	},
+	/**
+	 * Puzzles & Games rollout, tier v0 (the master switch).
+	 *
+	 * Gates the baseline Puzzles & Games experience: the new Puzzles Hub
+	 * page, and the 6 V0 puzzle pages (sudoku easy/medium/hard/killer,
+	 * word-wheel, wordiply). At v0, there is no archive, no calendar, no
+	 * progress indicators, no sign-in-to-track-progress prompt, no "more
+	 * from puzzles" rail, and the hub's sub-nav has no links yet.
+	 *
+	 * This is the master switch for the whole Puzzles & Games experience:
+	 * turning it off (or down to 0%) hides everything: the hub, the V0
+	 * puzzle pages, and (by the cumulative design below) every later tier
+	 * too, since v1/v2 only take effect when this is also enabled.
+	 *
+	 * See `puzzles-new-hub-v1`/`puzzles-new-hub-v2` below for the later
+	 * rollout tiers, and `src/lib/puzzlesHubVersionExperiment.ts` /
+	 * `src/lib/puzzlesHubExperiment.ts` in dotcom-rendering for the
+	 * corresponding cumulative gate-check helpers
+	 * (`isPuzzlesHubEnabled`/`isPuzzlesHubV1Enabled`/`isPuzzlesHubV2Enabled`).
+	 */
 	{
 		name: "puzzles-new-hub",
 		description: "Rollout of the new Puzzles Hub experience",
@@ -156,6 +176,68 @@ const ABTests: ABTest[] = [
 		groups: ["control", "variant"],
 		shouldForceMetricsCollection: false,
 	},
+	/**
+	 * Puzzles & Games rollout, tier v1 (w/c 12 Oct launch).
+	 *
+	 * Only takes effect when `puzzles-new-hub` (v0) is ALSO enabled for the
+	 * reader. This test does nothing on its own, by design, so the
+	 * rollout can never end up in an inconsistent state (e.g. v1 features
+	 * showing while the v0 baseline they build on is switched off).
+	 *
+	 * On top of v0, this tier activates: the full hub sub-nav links (to
+	 * /word-games, /logic-puzzles, /trivia-and-quizzes), a
+	 * sign-in-to-track-progress message, a calendar/archive view for
+	 * crosswords/logic-puzzles/word-games (not Wordiply, which has no
+	 * archive), progress indicators (Available/Completed), the "More from
+	 * Puzzles & Games" related-content rail, newsletter signup, and
+	 * changes to the existing crossword page (print CTA repositioning, a
+	 * "play other puzzles" container).
+	 *
+	 * To roll back from v1 to v0 without a deploy: flip this test's
+	 * `audienceSize` to `0 / 100` (or `status` to `"OFF"`) while leaving
+	 * `puzzles-new-hub` untouched.
+	 */
+	{
+		name: "puzzles-new-hub-v1",
+		description:
+			"Rollout of the v1 Puzzles & Games features (w/c 12 Oct), on top of the puzzles-new-hub v0 baseline",
+		owners: ["puzzles.team@guardian.co.uk"],
+		status: "ON",
+		expirationDate: "2026-12-31",
+		type: "server",
+		audienceSize: 0 / 100,
+		audienceSpace: "A",
+		groups: ["control", "variant"],
+		shouldForceMetricsCollection: false,
+	},
+	/**
+	 * Puzzles & Games rollout, tier v2 (future, no launch date confirmed
+	 * yet as of this writing).
+	 *
+	 * Only takes effect when BOTH `puzzles-new-hub` (v0) AND
+	 * `puzzles-new-hub-v1` are ALSO enabled for the reader, same
+	 * cumulative-by-design principle as v1 above, applied one tier further.
+	 *
+	 * On top of v0+v1, this tier activates: the On the Ball and Film Reveal
+	 * iframe games (Trivia and Quizzes group), a "Most played" container,
+	 * EventKit-driven navigation, migrating existing crossword pages onto
+	 * the new Puzzle Page template, and search-engine mobile app nudges.
+	 *
+	 * Kept at 0% until that work begins; there is nothing to roll back yet.
+	 */
+	{
+		name: "puzzles-new-hub-v2",
+		description:
+			"Rollout of the v2 Puzzles & Games features (no date confirmed yet), on top of the puzzles-new-hub/puzzles-new-hub-v1 baseline",
+		owners: ["puzzles.team@guardian.co.uk"],
+		status: "ON",
+		expirationDate: "2026-12-31",
+		type: "server",
+		audienceSize: 0 / 100,
+		audienceSpace: "A",
+		groups: ["control", "variant"],
+		shouldForceMetricsCollection: false,
+	},
 	{
 		name: "identity-and-trust-consent-rr-banner-us",
 		description:
@@ -187,10 +269,10 @@ const ABTests: ABTest[] = [
 		name: "commercial-prebid-failsafe-timeout",
 		description: "Gradually roll out the Prebid failsafe timeout feature",
 		owners: ["commercial.dev@guardian.co.uk"],
-		expirationDate: "2026-09-30",
+		expirationDate: "2026-10-28",
 		type: "client",
 		status: "ON",
-		audienceSize: 10 / 100,
+		audienceSize: 0 / 100,
 		audienceSpace: "B",
 		groups: ["control", "variant"],
 		shouldForceMetricsCollection: true,
@@ -215,7 +297,7 @@ const ABTests: ABTest[] = [
 		status: "ON",
 		audienceSize: 0 / 100,
 		audienceSpace: "B",
-		groups: ["control", "variant"],
+		groups: ["control", "variant", "variant2"],
 		shouldForceMetricsCollection: true,
 	},
 	{
@@ -239,7 +321,7 @@ const ABTests: ABTest[] = [
 		expirationDate: "2026-10-28",
 		type: "client",
 		status: "ON",
-		audienceSize: 0 / 100,
+		audienceSize: 2.1 / 100, // 0.35% in each variant
 		audienceSpace: "A",
 		groups: [
 			"variant-500",

dotcom-rendering/cdk/bin/cdk.ts

@@ -1,4 +1,4 @@
-import { App } from 'aws-cdk-lib';
+import { App, Duration } from 'aws-cdk-lib';
 import { InstanceClass, InstanceSize, InstanceType } from 'aws-cdk-lib/aws-ec2';
 import type { RenderingCDKStackProps } from '../lib/renderingStack';
 import { RenderingCDKStack } from '../lib/renderingStack';
@@ -115,6 +115,15 @@ export const TagPageRenderingPropsCODE: RenderingCDKStackProps = {
 		imageIdentifier: getImageIdentifier(),
 		taskCpu: 1024,
 		taskMemoryLimitMiB: 2048,
+		scaling: {
+			minimumTasks: 1,
+			maximumTasks: 9,
+			cpuScaling: {
+				targetValue: 20,
+				scaleInCooldown: Duration.seconds(60),
+				scaleOutCooldown: Duration.seconds(60),
+			},
+		},
 	},
 };
 
@@ -158,6 +167,17 @@ export const TagPageRenderingPropsPROD: RenderingCDKStackProps = {
 		imageIdentifier: getImageIdentifier(),
 		taskCpu: 2048,
 		taskMemoryLimitMiB: 4096,
+		scaling: {
+			minimumTasks: 9,
+			maximumTasks: 90,
+			cpuScaling: {
+				targetValue: 20,
+				// TODO: Tune cooldown values.
+				// https://docs.aws.amazon.com/autoscaling/application/userguide/target-tracking-scaling-policy-overview.html#target-tracking-cooldown
+				scaleInCooldown: Duration.seconds(60),
+				scaleOutCooldown: Duration.seconds(60),
+			},
+		},
 	},
 };