Dtscci 3202 test

.yarnrc.yml

@@ -1,7 +1,7 @@
-nodeLinker: node-modules
+compressionLevel: mixed
+
+enableGlobalCache: false
 
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
+nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
+yarnPath: .yarn/releases/yarn-4.12.0.cjs

Jenkinsfile_CNP

@@ -16,13 +16,48 @@ def checkForEnableHelmLabel(branch_name) {
 }
 
 def secrets = [
+  's2s-${env}':
+    [
+     secret('microservicekey-ccd-data', 'DATA_STORE_S2S_KEY'),
+     secret('microservicekey-ccd-definition', 'DEFINITION_STORE_S2S_KEY'),
+     secret('microservicekey-ccd-gw', 'API_GATEWAY_S2S_KEY'),
+     secret('microservicekey-ccd-ps', 'PRINT_S2S_KEY'),
+     secret('microservicekey-ccd-admin', 'ADMIN_S2S_KEY')
+    ],
   'cmc-${env}':
     [
+      secret('AppInsightsInstrumentationKey', 'AZURE_APPLICATIONINSIGHTS_INSTRUMENTATIONKEY'),
+      secret('appinsights-connection-string', 'APPINSIGHTS_CONNECTION_STRING'),
       secret('citizen-oauth-client-secret', 'OAUTH_CLIENT_SECRET'),
+      secret('citizen-oauth-client-secret', 'OAUTH2_CLIENT_SECRET'),
+      secret('claim-store-db-password', 'CLAIM_STORE_DB_PASSWORD'),
+      secret('cmc-db-password-v15', 'CMC_DB_PASSWORD'),
+      secret('cmc-db-username-v15', 'CMC_DB_USERNAME'),
+      secret('cmc-db-host-v15', 'CMC_DB_HOST'),
+      secret('claim-store-s2s-secret', 'IDAM_S2S_AUTH_TOTP_SECRET'),
+      secret('anonymous-caseworker-username', 'IDAM_CASEWORKER_ANONYMOUS_USERNAME'),
+      secret('anonymous-caseworker-password', 'IDAM_CASEWORKER_ANONYMOUS_PASSWORD'),
+      secret('system-update-username', 'IDAM_CASEWORKER_SYSTEM_USERNAME'),
+      secret('system-update-password', 'IDAM_CASEWORKER_SYSTEM_PASSWORD'),
+      secret('notify-api-key', 'GOV_NOTIFY_API_KEY'),
+      secret('milo-recipient', 'MILO_CSV_RECIPIENT'),
+      secret('staff-email', 'STAFF_NOTIFICATIONS_RECIPIENT'),
+      secret('live-support-email', 'LIVE_SUPPORT_RECIPIENT'),
+      secret('rpa-email-sealed-claim', 'RPA_NOTIFICATIONS_SEALEDCLAIMRECIPIENT'),
+      secret('rpa-email-breathing-space', 'RPA_NOTIFICATIONS_BREATHINGSPACERECIPIENT'),
+      secret('rpa-email-legal-sealed-claim', 'RPA_NOTIFICATIONS_LEGALSEALEDCLAIMRECIPIENT'),
+      secret('rpa-email-more-time-requested', 'RPA_NOTIFICATIONS_MORETIMEREQUESTEDRECIPIENT'),
+      secret('rpa-email-response', 'RPA_NOTIFICATIONS_RESPONSERECIPIENT'),
+      secret('rpa-email-ccj', 'RPA_NOTIFICATIONS_COUNTYCOURTJUDGEMENTRECIPIENT'),
+      secret('rpa-email-paid-in-full', 'RPA_NOTIFICATIONS_PAIDINFULLRECIPIENT'),
+      secret('launchDarkly-sdk-key', 'LAUNCH_DARKLY_SDK_KEY'),
+      secret('sendgrid-api-key', 'SENDGRID_API_KEY'),
+      secret('staff-email-legal-rep', 'STAFF_NOTIFICATIONS_LEGALRECIPIENT'),
       secret('smoke-test-citizen-username', 'SMOKE_TEST_CITIZEN_USERNAME'),
       secret('smoke-test-user-password', 'SMOKE_TEST_USER_PASSWORD'),
       secret('ccd-importer-username', 'CCD_CONFIGURER_IMPORTER_USERNAME'),
       secret('ccd-importer-password', 'CCD_CONFIGURER_IMPORTER_PASSWORD'),
+      secret('microservicekey-ccd-admin', 'ADMIN_S2S_KEY')
     ],
   'ccd-${env}': [
     secret('ccd-data-s2s-secret', 'DATA_STORE_S2S_KEY'),
@@ -78,6 +113,7 @@ withPipeline("nodejs", product, component) {
     sh """
     eval \$(./bin/variables/load-preview-env-variables.sh ${CHANGE_ID})
     ./bin/add-roles.sh
+    ./bin/wait-for.sh definition-store
     ./bin/pull-latest-ccd-defintion.sh ${ccdDefBranch}
     """
   }

README.md

@@ -8,7 +8,7 @@
 
 This is the frontend application for CMC. Service provides web UI for citizens, presented as sequence of HTML 5 web pages designed to GDS Service Design guidelines, so that they can make money claims and / or perform associated actions e.g submitting defence or requesting default judgement.
 
-Service delegates most of the non UI responsibilities to underlying services e.g. claim-store or pdf-service.
+Service delegates most of the non UI responsibilities to underlying services e.g. claim-store or pdf-service..
 
 ### Getting Started
 

bin/add-roles.sh

@@ -5,6 +5,7 @@
 ./bin/ccd-add-role.sh "caseworker-cmc"
 ./bin/ccd-add-role.sh "caseworker-cmc-systemupdate"
 ./bin/ccd-add-role.sh "caseworker-cmc-pcqextractor"
+./bin/ccd-add-role.sh "caseworker-cmc-rparobot"
 ./bin/ccd-add-role.sh "payments"
 ./bin/ccd-add-role.sh "caseworker-cmc-legaladvisor"
 ./bin/ccd-add-role.sh "letter-holder"
@@ -14,3 +15,4 @@
 ./bin/ccd-add-role.sh "payments-refund"
 ./bin/ccd-add-role.sh "payments-refund-approver"
 ./bin/ccd-add-role.sh "TTL-admin"
+

bin/run-functional-tests.sh

@@ -8,19 +8,27 @@ fi
 
 ADDITIONAL_COMPOSE_FILE="docker-compose.functional-tests.yml -f docker-compose.yml"
 
+if command -v docker-compose >/dev/null 2>&1; then
+  COMPOSE_CMD=(docker-compose)
+elif docker compose version >/dev/null 2>&1; then
+  COMPOSE_CMD=(docker compose)
+else
+  echo "docker compose is not available" >&2
+  exit 1
+fi
+
 function shutdownDocker() {
-  docker-compose -f ${ADDITIONAL_COMPOSE_FILE} down
+  "${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} down
 }
 
 trap shutdownDocker INT TERM QUIT EXIT
 
-docker-compose --version
+"${COMPOSE_CMD[@]}" --version
 
 if [[ "${1}" != "--no-build" ]]; then
   # Docker hub is slow to build we should always be using the latest version here
-  docker-compose -f ${ADDITIONAL_COMPOSE_FILE} build citizen-integration-tests
+  "${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} build citizen-integration-tests
 fi
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} up --no-color -d remote-webdriver
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} run -u `id -u $USER` citizen-integration-tests
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} down
-
+"${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} up --no-color -d remote-webdriver
+"${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} run -u `id -u $USER` citizen-integration-tests
+"${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} down

bin/run-nightly-tests.sh

@@ -8,19 +8,27 @@ fi
 
 ADDITIONAL_COMPOSE_FILE="docker-compose.nightly-functional-tests.yml -f docker-compose.yml"
 
+if command -v docker-compose >/dev/null 2>&1; then
+  COMPOSE_CMD=(docker-compose)
+elif docker compose version >/dev/null 2>&1; then
+  COMPOSE_CMD=(docker compose)
+else
+  echo "docker compose is not available" >&2
+  exit 1
+fi
+
 function shutdownDocker() {
-  docker-compose -f ${ADDITIONAL_COMPOSE_FILE} down
+  "${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} down
 }
 
 trap shutdownDocker INT TERM QUIT EXIT
 
-docker-compose --version
+"${COMPOSE_CMD[@]}" --version
 
 if [[ "${1}" != "--no-build" ]]; then
   # Docker hub is slow to build we should always be using the latest version here
-  docker-compose -f ${ADDITIONAL_COMPOSE_FILE} build citizen-integration-tests
+  "${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} build citizen-integration-tests
 fi
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} up --no-color -d remote-webdriver
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} run -u `id -u $USER` citizen-integration-tests
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} down
-
+"${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} up --no-color -d remote-webdriver
+"${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} run -u `id -u $USER` citizen-integration-tests
+"${COMPOSE_CMD[@]}" -f ${ADDITIONAL_COMPOSE_FILE} down

bin/run-smoke-tests.sh

@@ -1,24 +1,18 @@
 #!/bin/bash
-set -ex
+set -euo pipefail
 
-pip3 install --upgrade requests==2.31.0
-pip3 install docker==6.1.3
-
-ADDITIONAL_COMPOSE_FILE="docker-compose.smoke-tests.yml -f docker-compose.yml"
-
-function shutdownDocker() {
-  docker-compose -f ${ADDITIONAL_COMPOSE_FILE} down
-}
+if [[ -z "${TEST_URL:-}" ]]; then
+  echo "TEST_URL environment variable must be set" >&2
+  exit 1
+fi
 
-trap shutdownDocker INT TERM QUIT EXIT
+health_endpoint="${TEST_URL%/}/health"
 
-docker-compose --version
+echo "Running lightweight smoke healthcheck against ${health_endpoint}"
 
-if [[ "${1}" != "--no-build" ]]; then
-  # Docker hub is slow to build we should always be using the latest version here
-  docker-compose -f ${ADDITIONAL_COMPOSE_FILE} build citizen-integration-tests
+if curl -k --fail --silent --show-error --max-time 30 "$health_endpoint" > /dev/null; then
+  echo "Smoke healthcheck passed"
+else
+  echo "Smoke healthcheck failed" >&2
+  exit 1
 fi
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} up --no-color -d remote-webdriver
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} run -u `id -u $USER` citizen-integration-tests
-docker-compose -f ${ADDITIONAL_COMPOSE_FILE} down
-

bin/wait-for.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+set -eu
+
+selected_service=${@}
+
+echo "params: ${selected_service}"
+echo "CLAIM_STORE_URL: ${CLAIM_STORE_URL}"
+echo "URL: ${URL:-}"
+
+service_base_urls=${CLAIM_STORE_URL:-}
+if [[ "${selected_service}" == 'definition-store' ]]; then
+  service_base_urls=${CCD_DEFINITION_STORE_API_BASE_URL}
+fi
+
+echo "service_base_urls: ${service_base_urls}"
+
+max_health_check_attempts=30
+
+function checkHealth {
+  for service_base_url in ${service_base_urls}; do
+    uploadResponse=$(curl -k -w "\n%{http_code}" --silent ${service_base_url}/health)
+    upload_http_code=$(echo "$uploadResponse" | tail -n1)
+    echo $'\n' Http status: ${upload_http_code} >&2
+    if [[ "${upload_http_code}" -ne '200' ]]; then
+      exit 1
+    fi
+  done
+}
+
+until $(checkHealth); do
+  current_health_check_attempt=$((${current_health_check_attempt:-1} + 1))
+
+  if [ ${current_health_check_attempt} -gt ${max_health_check_attempts} ]; then
+    echo -e "\nMax number of attempts reached"
+    exit 1
+  fi
+
+  if [ ${current_health_check_attempt} -eq 2 ]; then
+    printf 'Awaiting healthy services'
+  else
+    printf '.'
+  fi
+
+  sleep 10
+done

charts/cmc-citizen-frontend/Chart.lock

@@ -0,0 +1,18 @@
+dependencies:
+- name: nodejs
+  repository: oci://hmctspublic.azurecr.io/helm
+  version: 3.2.0
+- name: idam-pr
+  repository: https://hmctspublic.azurecr.io/helm/v1/repo/
+  version: 2.2.7
+- name: cmc-claim-store
+  repository: https://hmctspublic.azurecr.io/helm/v1/repo/
+  version: 4.1.43
+- name: ccd
+  repository: https://hmctspublic.azurecr.io/helm/v1/repo/
+  version: 8.0.27
+- name: xui-webapp
+  repository: https://hmctspublic.azurecr.io/helm/v1/repo/
+  version: 1.0.18
+digest: sha256:7021ea069d163da22273861d54976e97d59e2bcf088729e7f9a95cbfda49fad7
+generated: "2026-01-16T16:17:42.913894Z"

charts/cmc-citizen-frontend/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cmc-citizen-frontend
 home: https://github.com/hmcts/cmc-citizen-frontend
-version: 4.1.59
+version: 4.1.60
 description: Helm chart for the HMCTS CMC Citizen Frontend service
 # be aware when bumping version that it is used elsewhere, e.g.:
 # chart-cmc - demo: https://github.com/hmcts/chart-cmc/tree/master/cmc
@@ -12,8 +12,8 @@ maintainers:
     email: cmc-developers@HMCTS.NET
 dependencies:
   - name: nodejs
-    version: 3.1.1
-    repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
+    version: 3.2.0
+    repository: 'oci://hmctspublic.azurecr.io/helm'
 
   - name: idam-pr
     version: 2.2.7
@@ -34,5 +34,3 @@ dependencies:
     version: ~1.0.8
     repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
     condition: xui-webapp.enabled
-
-