diff --git a/test_collections/matter/scripts/update-pull-sdk-docker-image.sh b/test_collections/matter/scripts/update-pull-sdk-docker-image.sh deleted file mode 100755 index e66779fe..00000000 --- a/test_collections/matter/scripts/update-pull-sdk-docker-image.sh +++ /dev/null @@ -1,41 +0,0 @@ -#! /usr/bin/env bash - - # - # Copyright (c) 2024 Project CHIP Authors - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. -set -e -MATTER_PROGRAM_DIR=$(realpath $(dirname "$0")/..) -TH_SCRIPTS_DIR="$MATTER_PROGRAM_DIR/../../../scripts" - -source "$TH_SCRIPTS_DIR/utils.sh" - -print_start_of_script - -# We are fetching SDK docker image and tag name from backend -# This is done to minimize the places the SDK version is tracked. -SDK_DOCKER_PACKAGE=$(cat $MATTER_PROGRAM_DIR/config.py | grep SDK_DOCKER_IMAGE | cut -d'"' -f 2 | cut -d"'" -f 2) -SDK_DOCKER_TAG=$(cat $MATTER_PROGRAM_DIR/config.py | grep SDK_DOCKER_TAG | cut -d'"' -f 2 | cut -d"'" -f 2) -SDK_DOCKER_IMAGE=$SDK_DOCKER_PACKAGE:$SDK_DOCKER_TAG - -DOCKER_IMAGE_FOUND=$(sudo docker images -q $SDK_DOCKER_IMAGE) - -if [[ -z "$DOCKER_IMAGE_FOUND" ]]; then - print_script_step "Pulling '$SDK_DOCKER_IMAGE' image" - sudo docker pull $SDK_DOCKER_IMAGE -else - echo "SDK Docker image already exists" - echo "$SDK_DOCKER_IMAGE" -fi - -print_end_of_script diff --git a/test_collections/matter/scripts/update-sample-apps.sh b/test_collections/matter/scripts/update-sample-apps.sh index 272d6b7b..c2161270 100755 --- a/test_collections/matter/scripts/update-sample-apps.sh +++ b/test_collections/matter/scripts/update-sample-apps.sh @@ -23,10 +23,29 @@ source "$TH_SCRIPTS_DIR/utils.sh" print_start_of_script print_script_step "Pulling chip-cert-bins docker image" -$MATTER_PROGRAM_DIR/scripts/update-pull-sdk-docker-image.sh + +# We are fetching SDK docker image and tag name from backend +# This is done to minimize the places the SDK version is tracked. +SDK_DOCKER_PACKAGE=$(cat $MATTER_PROGRAM_DIR/config.py | grep SDK_DOCKER_IMAGE | cut -d'"' -f 2 | cut -d"'" -f 2) +SDK_DOCKER_TAG=$(cat $MATTER_PROGRAM_DIR/config.py | grep SDK_DOCKER_TAG | cut -d'"' -f 2 | cut -d"'" -f 2) +SDK_DOCKER_IMAGE=$SDK_DOCKER_PACKAGE:$SDK_DOCKER_TAG + + +DOCKER_IMAGE_FOUND=$(sudo docker images -q $SDK_DOCKER_IMAGE) + +if [[ -z "$DOCKER_IMAGE_FOUND" ]]; then + print_script_step "Pulling '$SDK_DOCKER_IMAGE' image" + sudo docker pull $SDK_DOCKER_IMAGE +else + echo "SDK Docker image already exists" + echo "$SDK_DOCKER_IMAGE" +fi + print_script_step "Updating Sample APPs" -sudo docker run -t -v ~/apps:/apps $SDK_DOCKER_IMAGE bash -c "rm -v /apps/*; cp -v apps/* /apps/" +# TODO - Uncomment line bellow and remove the subsequent line when the SDK IMAGE contains the apps folder +# sudo docker run -t -v ~/apps:/apps $SDK_DOCKER_IMAGE bash -c "rm -v /apps/*; cp -v apps/* /apps/" +sudo docker run -t -v ~/apps:/apps $SDK_DOCKER_IMAGE bash -c "rm -v /apps/*; cp -v chip-* /apps/; cp -v thermostat-app /apps/; cp -v lit-icd-app /apps/;cp -v fabric-* /apps/; cp -v matter-network-manager-app /apps/" echo "Setting Sample APPs ownership" sudo chown -R `whoami` ~/apps