diff --git a/Jenkinsfile b/Jenkinsfile index a17df3f86..cd51674ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,12 +65,12 @@ pipeline { source docker/vars.local.tests.sh docker-compose -f docker/docker-compose.yml up -d ps_db docker-compose -f docker/docker-compose.yml up db_migration - aws s3 cp s3://snomed-schema/uk_sct2mo_38.2.0_20240605000001Z.zip ./snomed-database-loader/uk_sct2mo_38.2.0_20240605000001Z.zip + aws s3 cp s3://snomed-schema/uk_sct2mo_39.0.0_20240925000001Z.zip ./snomed-database-loader/uk_sct2mo_39.0.0_20240925000001Z.zip # As Jenkins is running inside of Docker too, can't just reference the snomed file as a volume as part of the docker run command # Instead copy the file into a named volume first as a separate docker command docker volume create --name snomed - cat ./snomed-database-loader/uk_sct2mo_38.2.0_20240605000001Z.zip | docker run --rm --interactive -v snomed:/snomed alpine sh -c "cat > /snomed/uk_sct2mo_38.2.0_20240605000001Z.zip" - docker-compose -f docker/docker-compose.yml run --rm --volume snomed:/snomed snomed_schema /snomed/uk_sct2mo_38.2.0_20240605000001Z.zip + cat ./snomed-database-loader/uk_sct2mo_39.0.0_20240925000001Z.zip | docker run --rm --interactive -v snomed:/snomed alpine sh -c "cat > /snomed/uk_sct2mo_39.0.0_20240925000001Z.zip" + docker-compose -f docker/docker-compose.yml run --rm --volume snomed:/snomed snomed_schema /snomed/uk_sct2mo_39.0.0_20240925000001Z.zip docker volume rm snomed ''' } @@ -206,7 +206,7 @@ pipeline { always { sh label: 'Remove exited containers', script: 'docker container prune --force' sh label: 'Remove images tagged with current BUILD_TAG', script: 'docker image rm -f $(docker images "*/*:*${BUILD_TAG}" -q) $(docker images "*/*/*:*${BUILD_TAG}" -q) || true' - sh label: 'Delete Snomed CT database zip', script: 'rm ./snomed-database-loader/uk_sct2mo_38.2.0_20240605000001Z.zip' + sh label: 'Delete Snomed CT database zip', script: 'rm ./snomed-database-loader/uk_sct2mo_39.0.0_20240925000001Z.zip' sh label: 'clean up dangling images', script: 'docker image prune -f' } // always } // post diff --git a/OPERATING.md b/OPERATING.md index fd0301948..e795694a8 100644 --- a/OPERATING.md +++ b/OPERATING.md @@ -125,8 +125,8 @@ can be executed against the database using the required environment variables li Example usage: ```sh $ docker run --rm -e PS_DB_OWNER_NAME=postgres -e POSTGRES_PASSWORD=super5ecret -e PS_DB_HOST=postgres -e PS_DB_PORT=5432 \ - -v /path/to/uk_sct2mo_38.2.0_20240605000001Z.zip:/snomed/uk_sct2mo_38.2.0_20240605000001Z.zip \ - nhsdev/nia-ps-snomed-schema /snomed/uk_sct2mo_38.2.0_20240605000001Z.zip + -v /path/to/uk_sct2mo_39.0.0_20240925000001Z.zip:/snomed/uk_sct2mo_39.0.0_20240925000001Z.zip \ + nhsdev/nia-ps-snomed-schema /snomed/uk_sct2mo_39.0.0_20240925000001Z.zip ``` #### First installation diff --git a/docker/example.vars.sh b/docker/example.vars.sh index b568c1c1a..443ba8662 100755 --- a/docker/example.vars.sh +++ b/docker/example.vars.sh @@ -42,4 +42,4 @@ export SDS_BASE_URL="https://int.api.service.nhs.uk/spine-directory/FHIR/R4/" export SKIP_DECODE="false" #change path for snomedFile fath -#export SNOMED_CT_TERMINOLOGY_FILE="/mnt/c/Users/yourUserName/yourPath/uk_sct2mo_38.2.0_20240605000001Z.zip"; \ No newline at end of file +#export SNOMED_CT_TERMINOLOGY_FILE="/mnt/c/Users/yourUserName/yourPath/uk_sct2mo_39.0.0_20240925000001Z.zip"; \ No newline at end of file diff --git a/docker/release-scripts/ps-mhs-e2e/vars.sh b/docker/release-scripts/ps-mhs-e2e/vars.sh index 5db5edf84..0489605e8 100644 --- a/docker/release-scripts/ps-mhs-e2e/vars.sh +++ b/docker/release-scripts/ps-mhs-e2e/vars.sh @@ -4,7 +4,7 @@ #SECRET KEY VARS #User-specific env variables -export SNOMED_FILE_LOCATION="../uk_sct2mo_38.2.0_20240605000001Z.zip" +export SNOMED_FILE_LOCATION="../uk_sct2mo_39.0.0_20240925000001Z.zip" export MHS_SECRET_PARTY_KEY="Y90664-9198273" export MHS_SECRET_CLIENT_CERT="-----BEGIN CERTIFICATE----- diff --git a/docker/start-local-environment.sh b/docker/start-local-environment.sh index 6b4700090..5e6fded14 100755 --- a/docker/start-local-environment.sh +++ b/docker/start-local-environment.sh @@ -17,7 +17,7 @@ docker-compose up -d ps_db mhs-adaptor-mock activemq; cd ../db-connector ./gradlew update -##### comment out if there is no uk_sct2mo_38.2.0_20240605000001Z.zip file +##### comment out if there is no uk_sct2mo_*.zip file cd ../snomed-database-loader ./load_release-postgresql.sh "$SNOMED_CT_TERMINOLOGY_FILE" diff --git a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP11-output.json b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP11-output.json index 60b68914d..928b8805c 100644 --- a/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP11-output.json +++ b/gp2gp-translator/src/integrationTest/resources/e2e-mapping/output-json/PWTP11-output.json @@ -2692,7 +2692,7 @@ } ], "system": "http://snomed.info/sct", "code": "160274005", - "display": "No family history diabetes" + "display": "No family history of diabetes mellitus" } ], "text": "No FH: diabetes" }, diff --git a/snomed-database-loader/load_release-postgresql.sh b/snomed-database-loader/load_release-postgresql.sh index eb6efcff5..c3c2aac7d 100755 --- a/snomed-database-loader/load_release-postgresql.sh +++ b/snomed-database-loader/load_release-postgresql.sh @@ -9,7 +9,7 @@ isMonolith=false if [ -z ${releasePath} ] then - echo "Please set the path to zipped SnomedCT RF2 release as the first argument, e.g. ./load_release-postgresql.sh uk_sct2mo_38.2.0_20240605000001Z.zip" + echo "Please set the path to zipped SnomedCT RF2 release as the first argument, e.g. ./load_release-postgresql.sh uk_sct2mo_39.0.0_20240925000001Z.zip" exit -1 fi diff --git a/test-suite/README.md b/test-suite/README.md index 4819a4f9f..dd632e8a8 100644 --- a/test-suite/README.md +++ b/test-suite/README.md @@ -76,7 +76,7 @@ If you want to start from a fresh DB, delete the volume with `docker volume rm t SDS_API_KEY: "change_if_needed" # used for calculating migration timeouts #changepathforsnomedFilepath - SNOMED_CT_TERMINOLOGY_FILE: "/snomed/file/location/uk_sct2mo_38.2.0_20240605000001Z.zip" + SNOMED_CT_TERMINOLOGY_FILE: "/snomed/file/location/uk_sct2mo_39.0.0_20240925000001Z.zip" PS_LOGGING_LEVEL: "DEBUG" diff --git a/test-suite/docker/vars.sh b/test-suite/docker/vars.sh index 60df2cfca..2b8fa229c 100644 --- a/test-suite/docker/vars.sh +++ b/test-suite/docker/vars.sh @@ -3,7 +3,7 @@ # MHS VARS #SECRET KEY VARS #User-specific env variables -export SNOMED_FILE_LOCATION="../uk_sct2mo_38.2.0_20240605000001Z.zip" +export SNOMED_FILE_LOCATION="../uk_sct2mo_39.0.0_20240925000001Z.zip" export MHS_SECRET_PARTY_KEY="Y90664-9198273" export MHS_SECRET_CLIENT_CERT="-----BEGIN CERTIFICATE----- MIIFPTCCAyUCFAKYCULeFVcQCwXCGCiCFVu09NmzMA0GCSqGSIb3DQEBCwUAMF0x