rename daisy bin with gerrit number

Change-Id: I5314a0ba1a7885c334ea939c91eaa6ece074cb0d
Signed-off-by: Yao Lu <lu.yao135@zte.com.cn>

diff --git a/ci/build.sh b/ci/build.sh
index e134bdd..4b49fb1 100755 (executable)
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -11,8 +11,9 @@
 
 # TODO: Let JJB to pass $WORKDIR instead of $BUILD_OUTPUT
 DAISYDIR=$1/../
+OPNFV_ARTIFACT_VERSION=$2
 
 cd ci/build_rpm
-./build_rpms.sh $DAISYDIR
+./build_rpms.sh $DAISYDIR $OPNFV_ARTIFACT_VERSION
 
 

diff --git a/ci/build_rpm/build_rpms.sh b/ci/build_rpm/build_rpms.sh
index 6549098..4f18d8e 100755 (executable)
--- a/ci/build_rpm/build_rpms.sh
+++ b/ci/build_rpm/build_rpms.sh
@@ -10,6 +10,8 @@
 ##############################################################################
 set -eux
 DAISYDIR=$1
+OPNFV_ARTIFACT_VERSION=$2
+
 function build_rpm_pkg {
         # Cleanup prev build resutls
         rm -rf $DAISYDIR/build_output
@@ -17,7 +19,7 @@ function build_rpm_pkg {
 
         sudo docker build -t daisy4nfv_rpm .
         sudo docker run --rm -v $DAISYDIR:/opt/daisy4nfv -t  daisy4nfv_rpm \
-                      /opt/daisy4nfv/ci/build_rpm/build_rpms_docker.sh
+                      /opt/daisy4nfv/ci/build_rpm/build_rpms_docker.sh $OPNFV_ARTIFACT_VERSION
 
        # Here to collect build result from $DAISYDIR/build_output
 }

diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh
index 8b5c409..be4064d 100755 (executable)
--- a/ci/build_rpm/build_rpms_docker.sh
+++ b/ci/build_rpm/build_rpms_docker.sh
@@ -9,6 +9,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+OPNFV_ARTIFACT_VERSION=$1
 rpm_build_dir=/opt/daisy4nfv
 rpm_output_dir=$rpm_build_dir/build_output
 tmp_rpm_build_dir=/root/daisy4nfv
@@ -47,5 +48,6 @@ do
     fi
 done
 cd ..
-cp target/el7/noarch/installdaisy_el7_noarch.bin $rpm_output_dir
+mv target/el7/noarch/installdaisy_el7_noarch.bin target/el7/noarch/opnfv-$OPNFV_ARTIFACT_VERSION.bin
+cp target/el7/noarch/opnfv-$OPNFV_ARTIFACT_VERSION.bin $rpm_output_dir
 exit $rc