X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-lib-rmr%2Fshell%2Fcopy-rmr-packages.sh;h=c13c62077d2d579f1e215f5710429730027cae92;hb=66a126044c9b105e41d8cf359823e66e5c9a43e3;hp=5121abfa491dc4584c5472840b2d3e7edd09ba10;hpb=23032140a65ef669076e16a9b7d4ba3262db7ee1;p=ci-management.git

diff --git a/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh b/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh
index 5121abfa..c13c6207 100755
--- a/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh
+++ b/jjb/ric-plt-lib-rmr/shell/copy-rmr-packages.sh
@@ -1,4 +1,7 @@
-#!/bin/bash
+#!/bin/bash -l
+# use login flag to get $HOME/.local/bin in PATH
+# bcos pip installs yq to $HOME/.local/bin
+
 #==================================================================================
 #       Copyright (c) 2019 Nokia
 #       Copyright (c) 2018-2019 AT&T Intellectual Property.
@@ -20,22 +23,19 @@ set -eux -o pipefail
 echo "--> copy-rmr-packages.sh"
 
 # extracts artifacts created by the builder
-
 # file with paths of generated deb, rpm packages
-pkgs="/tmp/build_output.yml"
+pkgs="build_packages.yml"
 
-# access builder files by creating a container with a trivial command
+# access builder files within a container created by running a trivial command
 # environment variables are injected in previous Jenkins steps
 container=$(docker run -d "$CONTAINER_PUSH_REGISTRY"/"$DOCKER_NAME":"$DOCKER_IMAGE_TAG" ls)
-docker cp "$container":"$pkgs" .
-pkgs_base=$(basename "$pkgs")
-
-deb=$(yq -r .deb "$pkgs_base")
-docker cp "$container":"$deb" .
-deb_base=$(basename "$deb")
-echo "Push file $deb_base" # TODO
+docker cp "${container}:/tmp/${pkgs}" .
 
-rpm=$(yq -r .rpm "$pkgs_base")
-docker cp "$container":"$rpm" .
-rpm_base=$(basename "$rpm")
-echo "Push file $rpm_base" # TODO
+count=$(yq -r '.files | length' $pkgs)
+# modern bash syntax is helpful
+for (( i = 0; i < count; i++ )); do
+    file=$(yq -r ".files[$i]" "$pkgs")
+    docker cp "$container":"$file" .
+    base=$(basename "$file")
+    echo "Push file $base" # TODO
+done