X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ci%2Fci_build.ksh;h=9ee710d1ffb3a3efeab116990ee977d1f3e8aadb;hb=f447e29dffd0a24fcf02288b9591ce7d03a8fb9d;hp=31c821c28f098e5ee833fe0e41c54fe7800e1252;hpb=d4f18ba140f06b863ac51697d1a0d420bcd3ae6a;p=ric-plt%2Flib%2Frmr.git

diff --git a/ci/ci_build.ksh b/ci/ci_build.ksh
index 31c821c..9ee710d 100644
--- a/ci/ci_build.ksh
+++ b/ci/ci_build.ksh
@@ -42,17 +42,19 @@
 #	Date:		14 June 2019
 # --------------------------------------------------------------------------------
 
-# stash a set of packages for a particular flavour ($1)
+# stash a set of packages for a particular flavour ($1). Records what was kept
+# in a yaml file for an external process to grab, and in a simple publication
+# list for our internal publish script to gobble up.
 #
 function stash_pkgs {
-	echo "  - $1:" >>$yaml_file      # add package flavour (dev, runtime, etc)
+	mkdir -p $target_dir/exported
 
 	for pkg in deb rpm
 	do
 		ls .build/*.$pkg 2>/dev/null | while read f
 		do
-			cp $f $target_dir/${f##*/}
-			echo "    $pkg: $target_dir/${f##*/}" >>$yaml_file
+			cp $f $target_dir/exported/${f##*/}
+			echo "  - $target_dir/exported/${f##*/}" >>$yaml_file
 		done
 
 	done
@@ -72,6 +74,7 @@ do
 		*)	echo "$1 is not recognised"
 			echo ""
 			echo "usage: $0 [-t target-dir]"
+			echo "   target dir defaults to /tmp and is where packages and lists are placed."
 			exit 1
 			;;
 	esac
@@ -81,8 +84,11 @@ done
 
 if [[ ! -d $target_dir ]]
 then
-	echo "[FAIL] cannot find directory: $target_dir"
-	exit 1
+	if ! -mkdir -p $target_dir
+	then
+		echo "[FAIL] cannot find or create target directory: $target_dir"
+		exit 1
+	fi
 fi
 
 if [[ ! -d ./ci ]]							# verify we are in the root of the RMr repo filesystem, abort if not
@@ -106,19 +112,10 @@ mkdir -p .build
 	cd test                 		# execute tests
 	ksh unit_test.ksh				# unit tests first
 	cd app_test
-	ksh run_all.ksh					# application based tests if units pass
+	ksh run_all.sh					# application based tests if units pass
 )
 
-# initialise the yaml file
-cat <<-endKat >$yaml_file
----
-# package types which might be listed below
-pkg_types:
-  - deb
-  - rpm
-
-packages:
-endKat
+printf "---\nfiles:\n" >$yaml_file 	# initialise the yaml file
 
 stash_pkgs development      # testing good, stash dev packages built above