X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=test%2Fcommon%2Frapp_catalogue_api_functions.sh;h=254883eb8ac1014d1092b9ff09df0ec91a819e5a;hb=483ee33ac3de88385c0eeb3f1ecf3a1bb760db54;hp=10f64e6d07be3eb3080d24d38f944d99c520ab07;hpb=bb648288c9102fb69a18235a3cc2a67b1cad8abf;p=nonrtric.git diff --git a/test/common/rapp_catalogue_api_functions.sh b/test/common/rapp_catalogue_api_functions.sh index 10f64e6d..254883eb 100644 --- a/test/common/rapp_catalogue_api_functions.sh +++ b/test/common/rapp_catalogue_api_functions.sh @@ -34,13 +34,17 @@ __RC_imagesetup() { # Shall be used for images that does not allow overriding # Both arg var may contain: 'remote', 'remote-remove' or 'local' __RC_imagepull() { - __check_and_pull_image $1 "$c" $RAPP_CAT_APP_NAME $RAPP_CAT_IMAGE + __check_and_pull_image $1 "$c" $RAPP_CAT_APP_NAME RAPP_CAT_IMAGE } # 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: __RC_image_data() { echo -e "$RAPP_CAT_DISPLAY_NAME\t$(docker images --format $1 $RAPP_CAT_IMAGE)" >> $2 + if [ ! -z "$RAPP_CAT_IMAGE_SOURCE" ]; then + echo -e "-- source image --\t$(docker images --format $1 $RAPP_CAT_IMAGE_SOURCE)" >> $2 + fi } # Scale kubernetes resources to zero