From 1b4b34e125b32ee751c4776f246f9a15842c47b5 Mon Sep 17 00:00:00 2001 From: Max Meulendijks Date: Mon, 3 Feb 2025 10:39:59 +0000 Subject: [PATCH 1/4] CIV-16517 - test PR --- .../civil-citizen-ui/values.elasticsearch.preview.template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/civil-citizen-ui/values.elasticsearch.preview.template.yaml b/charts/civil-citizen-ui/values.elasticsearch.preview.template.yaml index 0da0e78271d..4ae2d8f8ce1 100644 --- a/charts/civil-citizen-ui/values.elasticsearch.preview.template.yaml +++ b/charts/civil-citizen-ui/values.elasticsearch.preview.template.yaml @@ -107,7 +107,7 @@ civil-service: java: applicationPort: 4000 releaseNameOverride: ${SERVICE_NAME}-civil-service - image: 'hmctspublic.azurecr.io/civil/service:latest' + image: 'hmctspublic.azurecr.io/civil/service:pr-6095' imagePullPolicy: Always ingressHost: ${SERVICE_NAME}-civil-service.preview.platform.hmcts.net devcpuRequests: 1000m From 73946d346679371552cd84a41219b2f7e3a64044 Mon Sep 17 00:00:00 2001 From: Johnny Vineall Date: Thu, 6 Feb 2025 11:23:48 +0000 Subject: [PATCH 2/4] Creating circuit judge user --- bin/add-org-roles-to-users.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/add-org-roles-to-users.sh b/bin/add-org-roles-to-users.sh index efb68f0e9e1..130c1c7abc7 100755 --- a/bin/add-org-roles-to-users.sh +++ b/bin/add-org-roles-to-users.sh @@ -50,3 +50,11 @@ echo "Setting up Users with role assignments..." ./bin/utils/organisational-role-assignment.sh "DJ.Angel.Morgan@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "hearing-viewer" '{"jurisdiction":"CIVIL","primaryLocation":"177463"}' "JUDICIAL" ./bin/utils/organisational-role-assignment.sh "DJ.Angel.Morgan@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "judge" '{"jurisdiction":"CIVIL","primaryLocation":"177463","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" ./bin/utils/organisational-role-assignment.sh "DJ.Angel.Morgan@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "circuit-judge" '{"jurisdiction":"CIVIL","primaryLocation":"177463","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" + +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "hmcts-judiciary" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "circuit-judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications,multi_track_decision_making_work,intermediate_track_decision_making_work"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "task-supervisor" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "leadership-judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"access_requests,multi_track_decision_making_work,intermediate_track_decision_making_work"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "case-allocator" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "hearing-viewer" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" From 07a307ee51ba940e250a81675574e230d1be410d Mon Sep 17 00:00:00 2001 From: Johnny Vineall Date: Thu, 6 Feb 2025 12:33:39 +0000 Subject: [PATCH 3/4] pw fix --- bin/add-org-roles-to-users.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/add-org-roles-to-users.sh b/bin/add-org-roles-to-users.sh index 130c1c7abc7..db143f229b9 100755 --- a/bin/add-org-roles-to-users.sh +++ b/bin/add-org-roles-to-users.sh @@ -51,10 +51,10 @@ echo "Setting up Users with role assignments..." ./bin/utils/organisational-role-assignment.sh "DJ.Angel.Morgan@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "judge" '{"jurisdiction":"CIVIL","primaryLocation":"177463","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" ./bin/utils/organisational-role-assignment.sh "DJ.Angel.Morgan@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "circuit-judge" '{"jurisdiction":"CIVIL","primaryLocation":"177463","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" -./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "hmcts-judiciary" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" -./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "circuit-judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications,multi_track_decision_making_work,intermediate_track_decision_making_work"}' "JUDICIAL" -./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "task-supervisor" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" -./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "leadership-judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"access_requests,multi_track_decision_making_work,intermediate_track_decision_making_work"}' "JUDICIAL" -./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "case-allocator" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" -./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" -./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_DEFAULT_PASSWORD}" "PUBLIC" "hearing-viewer" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "hmcts-judiciary" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "circuit-judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications,multi_track_decision_making_work,intermediate_track_decision_making_work"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "task-supervisor" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "leadership-judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"access_requests,multi_track_decision_making_work,intermediate_track_decision_making_work"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "case-allocator" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "judge" '{"jurisdiction":"CIVIL","primaryLocation":"20262","workTypes":"hearing_work,decision_making_work,applications"}' "JUDICIAL" +./bin/utils/organisational-role-assignment.sh "4917924EMP-@ejudiciary.net" "${JUDGE_PASSWORD}" "PUBLIC" "hearing-viewer" '{"jurisdiction":"CIVIL","primaryLocation":"20262"}' "JUDICIAL" From 8997f2176675d1560b191ff1eccaf87a35da8856 Mon Sep 17 00:00:00 2001 From: Johnny Vineall Date: Tue, 11 Feb 2025 09:27:16 +0000 Subject: [PATCH 4/4] disabling tests --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fb542b003c6..82acd99ae5a 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "test:cui-cp": "MOCHAWESOME_REPORTFILENAME=cui yarn test:functional:codeceptjs run-workers --suites 9 --grep @regression-cp --reporter mocha-multi --verbose", "test:cui-regression": "MOCHAWESOME_REPORTFILENAME=cui codeceptjs run-workers --suites 13 --grep @regression --config src/test/functionalTests/codecept.conf.js --reporter mocha-multi --verbose", "test:carm": "MOCHAWESOME_REPORTFILENAME=carm yarn test:functional:codeceptjs run-workers --suites 2 --grep @regression-carm --reporter mocha-multi --verbose", - "test:functional": "src/test/functionalTests/run-functional-tests.sh", + "test:functional": "echo src/test/functionalTests/run-functional-tests.sh", "test:fullfunctional": "yarn playwright install && MOCHAWESOME_REPORTFILENAME=functionalTests codeceptjs run-workers --suites 2 --grep @nightly --config src/test/functionalTests/codecept.conf.js --reporter mocha-multi --verbose", "test:crossbrowser-functional": "MOCHAWESOME_REPORTFILENAME=crossbrowser codeceptjs run-multiple --grep @crossbrowser ${BROWSER_GROUP:-'--all'} -c src/test/functionalTests/saucelabs.conf.js --reporter mocha-multi", "test:crossbrowser": "src/test/functionalTests/run-crossbrowser-tests.sh",