Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

01 - Isolate SDK docker pull script #142

Merged
merged 2 commits into from
Nov 7, 2024
Merged

01 - Isolate SDK docker pull script #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48f5e00
Isolate SDK docker pull script
hiltonlima Sep 9, 2024
7bfd478
Changes after code review
rquidute Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions test_collections/matter/scripts/update-pull-sdk-docker-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#! /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
17 changes: 2 additions & 15 deletions test_collections/matter/scripts/update-sample-apps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,8 @@ 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_script_step "Pulling chip-cert-bins docker image"
$MATTER_PROGRAM_DIR/scripts/update-pull-sdk-docker-image.sh

print_script_step "Updating Sample APPs"
# TODO: update SDK image to place the apps in a specific folder and then copy that entire folder
Expand Down
Loading