diff --git a/backend b/backend index ee07018..e20beac 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit ee07018bcfb31d976d18dff3663736c014573b0c +Subproject commit e20beacfccc3c578cf0e887976f05961c4d880cc diff --git a/docker-compose.yml b/docker-compose.yml index f9e3649..da1848c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -77,7 +77,7 @@ services: - node.labels.${STACK_NAME?Variable not set}.app-db-data == true backend: - image: 'ghcr.io/project-chip/csa-certification-tool-backend:ee07018' + image: 'ghcr.io/project-chip/csa-certification-tool-backend:e20beac' ports: - "8888:8888" diff --git a/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc b/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc index 552919f..0244c41 100755 --- a/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc +++ b/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.adoc @@ -17,7 +17,7 @@ :ubuntu-version: 24.04.x :ubuntu-description: Ubuntu Server {ubuntu-version} LTS (64-bit) -:th-version: v2.14-beta3+fall2025 +:th-version: v2.14+fall2025 = Matter Test-Harness User Manual: {th-version} ifdef::env-github[] :tip-caption: :bulb: @@ -51,7 +51,7 @@ endif::[] | Matter 1.4 | v2.11+fall2024 | N/A | https://groups.csa-iot.org/wg/members-all/document/folder/4120[Causeway Link] | f2e5de7 | To install, use the tag "v2.11+fall2024" in the instructions of <> | Matter 1.4.1 | v2.12+spring2025 | N/A | https://groups.csa-iot.org/wg/members-all/document/folder/4497[Causeway Link] | 91eab26 | To install, use the tag "v2.12+spring2025" in the instructions of <> | Matter 1.4.2 | v2.13+summer2025 | N/A | https://groups.csa-iot.org/wg/members-all/document/folder/4651[Causeway Link] | 1b2b3fd | To install, use the tag "v2.13+summer2025" in the instructions of <> -| Matter 1.5 | v2.14-beta3+fall2025 | N/A | TBD | f902839 | To install, use the tag "v2.14-beta3+fall2025" in the instructions of <> +| Matter 1.5 | v2.14+fall2025 | N/A | https://groups.csa-iot.org/wg/members-all/document/folder/4825[Causeway Link] | ca9d111 | To install, use the tag "v2.14+fall2025" in the instructions of <> |=== @@ -126,7 +126,8 @@ endif::[] | 47 | 05-May-2025 | [Apple]Romulo Quidute, [Apple]Antonio Melo| Changes for v2.13+summer2025 version: + * Added the platform certification configuration section. + * Updated the docker command in Factory-reset the DUT section + - * Added the Wi-Fi PAF section supported by Matter 1.4.2 + * Added the Wi-Fi PAF section supported by Matter 1.4.2. +| 48 | 10-Nov-2025 | [Apple]Romulo Quidute, [Apple]Antonio Melo| * Changes for v2.14+fall2025 version. |=== <<< diff --git a/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.pdf b/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.pdf index 49b9136..8e3b1cd 100644 Binary files a/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.pdf and b/docs/Matter_TH_User_Guide/Matter_TH_User_Guide.pdf differ diff --git a/scripts/ubuntu/1-install-dependencies.sh b/scripts/ubuntu/1-install-dependencies.sh index b82a5cc..80a8afd 100755 --- a/scripts/ubuntu/1-install-dependencies.sh +++ b/scripts/ubuntu/1-install-dependencies.sh @@ -39,8 +39,23 @@ readarray packagelist < "$UBUNTU_SCRIPT_DIR/package-dependency-list.txt" SAVEIFS=$IFS IFS=$(echo -en "\r") for package in ${packagelist[@]}; do - print_script_step "Instaling package: ${package[@]}" - sudo DEBIAN_FRONTEND=noninteractive apt-get satisfy ${package[@]} -y --allow-downgrades + print_script_step "Installing package: ${package[@]}" + + # Special handling for docker-ce to avoid version 29.x + if [[ "${package%%[[:space:]]}" == docker-ce* ]]; then + # Get the latest version that is not 29.x + DOCKER_VERSION=$(apt-cache madison docker-ce | awk '$3 !~ /^5:29\./ {print $3; exit}') + if [ -n "$DOCKER_VERSION" ]; then + print_script_step "Installing docker-ce version $DOCKER_VERSION (excluding 29.x)" + sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades docker-ce=$DOCKER_VERSION docker-ce-cli=$DOCKER_VERSION containerd.io + sudo apt-mark hold docker-ce docker-ce-cli + else + echo "ERROR: No suitable docker-ce version found (excluding 29.x)" + exit 1 + fi + else + sudo DEBIAN_FRONTEND=noninteractive apt-get satisfy "${package%%[[:space:]]}" -y --allow-downgrades + fi done IFS=$SAVEIFS diff --git a/scripts/ubuntu/package-dependency-list.txt b/scripts/ubuntu/package-dependency-list.txt index 28d9642..915d693 100644 --- a/scripts/ubuntu/package-dependency-list.txt +++ b/scripts/ubuntu/package-dependency-list.txt @@ -1,3 +1,3 @@ -docker-ce (>=5:24.0.7-1~ubuntu.22.04~jammy) +docker-ce (<< 5:29.0) python3-pip (>=24.0+dfsg-1ubuntu1) python3-venv (>=3.12.3-0ubuntu1) \ No newline at end of file