From 61ca7d7834e8b987bd118fe23aa8f4c6aabd14f1 Mon Sep 17 00:00:00 2001 From: Charu Jain Date: Thu, 12 Sep 2019 18:18:24 +0000 Subject: [PATCH] Adding airship folder for packaging airship components Change-Id: Ib1f537294dabd8dcc5757b35f69c9f6c14e2a501 --- airship/README.rst | 1 + tools/run_renderspec.sh | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 airship/README.rst diff --git a/airship/README.rst b/airship/README.rst new file mode 100644 index 000000000..84309ee45 --- /dev/null +++ b/airship/README.rst @@ -0,0 +1 @@ +RPM Packaging for Airship Components diff --git a/tools/run_renderspec.sh b/tools/run_renderspec.sh index a92282f8a..a2ae6a851 100755 --- a/tools/run_renderspec.sh +++ b/tools/run_renderspec.sh @@ -7,7 +7,7 @@ basedir=${1:-$PWD} # 2nd positional arg is the find -name parameter FIND_STR=${2:-*} -specdir=${basedir}/openstack/ +specdirs="${basedir}/openstack/ ${basedir}/airship/" WORKSPACE=${WORKSPACE:-$basedir} OUTPUTDIR=$WORKSPACE/logs/ @@ -21,12 +21,14 @@ for specstyle in $specstyles; do done count=0 -echo "run renderspec over specfiles from ${specdir}" +echo "run renderspec over specfiles from ${specdirs}" for specstyle in $specstyles; do - find ${specdir} -name "${FIND_STR}.spec.j2" -type f -print0 | \ - xargs -n 1 -0 -P 0 -I __SPEC__ bash -c " - set -e - pkg_name=\$(pymod2pkg --dist $specstyle \$(basename __SPEC__ .spec.j2)) - renderspec --spec-style $specstyle __SPEC__ \ - -o $WORKSPACE/logs/$specstyle/\$pkg_name.spec" + for specdir in $specdirs; do + find ${specdir} -name "${FIND_STR}.spec.j2" -type f -print0 | \ + xargs -n 1 -0 -P 0 -I __SPEC__ bash -c " + set -e + pkg_name=\$(pymod2pkg --dist $specstyle \$(basename __SPEC__ .spec.j2)) + renderspec --spec-style $specstyle __SPEC__ \ + -o $WORKSPACE/logs/$specstyle/\$pkg_name.spec" + done done