X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Fgateway_api_functions.sh;h=fbeaddf91c71f15d70cd03abb7b56bef8b4e1f33;hb=d2c7d37bcf7e9193e2fafdff06802d233294a711;hp=d8f2cf1aca31c313772aa657dd680575dc579f97;hpb=edea18a8fda2e2201cb3ede7f7af13f610bf4acc;p=nonrtric.git diff --git a/test/common/gateway_api_functions.sh b/test/common/gateway_api_functions.sh index d8f2cf1a..fbeaddf9 100644 --- a/test/common/gateway_api_functions.sh +++ b/test/common/gateway_api_functions.sh @@ -35,7 +35,7 @@ __NGW_imagesetup() { # Shall be used for images that does not allow overriding # Both var may contain: 'remote', 'remote-remove' or 'local' __NGW_imagepull() { - __check_and_pull_image $1 "$NRT_GATEWAY_DISPLAY_NAME" $NRT_GATEWAY_APP_NAME $NRT_GATEWAY_IMAGE + __check_and_pull_image $1 "$NRT_GATEWAY_DISPLAY_NAME" $NRT_GATEWAY_APP_NAME NRT_GATEWAY_IMAGE } # Build image (only for simulator or interfaces stubs owned by the test environment) @@ -46,9 +46,13 @@ __NGW_imagebuild() { } # Generate a string for each included image using the app display name and a docker images format string +# If a custom image repo is used then also the source image from the local repo is listed # arg: __NGW_image_data() { echo -e "$NRT_GATEWAY_DISPLAY_NAME\t$(docker images --format $1 $NRT_GATEWAY_IMAGE)" >> $2 + if [ ! -z "$NRT_GATEWAY_IMAGE_SOURCE" ]; then + echo -e "-- source image --\t$(docker images --format $1 $NRT_GATEWAY_IMAGE_SOURCE)" >> $2 + fi } # Scale kubernetes resources to zero