X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fbuild.sh;h=ef06a716c1b1054d67aba6abf517a4a1278e2c36;hb=878d38941df56e0392cb652efe3c5996592e7f39;hp=064c48a8b626629160e8f63bf139c84ab9135cd9;hpb=7552c26370d38ef5dd182682a0d3bf096661fe0e;p=kvmfornfv.git

diff --git a/ci/build.sh b/ci/build.sh
index 064c48a8b..ef06a716c 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -2,6 +2,26 @@
 #
 # Common parameter parsing for kvmfornfv scripts
 #
+
+function checking_apex_build() {
+    echo ""
+    commit=`git rev-parse HEAD`
+    echo "commit id: $commit"
+    echo "Checking for presence of apex.conf in the current patch"
+    git diff-tree --no-commit-id --name-only -r ${commit} | grep apex.conf
+#    result=`git show --name-only ${commit} | grep apex.conf`
+    result=`git diff-tree --no-commit-id --name-only -r ${commit} | grep apex.conf`
+    if [ -z "${result}" ]; then
+       echo "Does not include the file apex.conf"
+       apex_build_flag=0
+    else
+       source $WORKSPACE/ci/apex.conf
+       echo "Includes apex.conf"
+       apex_build_flag=1
+    fi
+}
+
+
 function usage() {
     echo ""
     echo "Usage --> $0 [-p package_type] [-o output_dir] [-h]"
@@ -14,29 +34,43 @@ function usage() {
 output_dir=""
 type=""
 
+function run() {
+   case $1 in
+      centos)
+         if [ ${apex_build_flag} -eq 0 ];then
+            cd $WORKSPACE/ci/build_rpm
+            sudo docker build -t kvm_rpm .
+            sudo docker run --privileged=true -v $WORKSPACE:/opt/kvmfornfv -t  kvm_rpm \
+                         /opt/kvmfornfv/ci/build_interface.sh $1
+         else
+            cd $WORKSPACE/ci/
+            echo $output_dir
+            sudo docker build -t kvm_apex .
+            sudo docker run --privileged=true -v $WORKSPACE:/opt/kvmfornfv -t  kvm_apex  \
+                         /opt/kvmfornfv/ci/apex_build.sh build_output
+         fi
+      ;;
+      ubuntu)
+         cd $WORKSPACE/ci/build_deb
+         sudo docker build -t kvm_deb .
+         sudo docker run -v $WORKSPACE:/opt/kvmfornfv -t  kvm_deb \
+                      /opt/kvmfornfv/ci/build_interface.sh $1
+      ;;
+      *) echo "Not supported system"; exit 1;;
+   esac
+}
+
 function build_package() {
     choice=$1
-
     case "$choice" in
-        "centos")
-            echo "Build $choice Rpms"
-            cd ci/build_rpm
-            ./build_rpms.sh
-            cd $WORKSPACE
-        ;;
-        "ubuntu")
-            echo "Build $choice Debians"
-            cd ci/build_deb
-            ./build_debs.sh
-            cd $WORKSPACE
+        "centos"|"ubuntu")
+            echo "Build $choice Rpms/Debians"
+            run $choice
         ;;
         "both")
             echo "Build $choice Debians and Rpms"
-            cd ci/build_deb
-            ./build_debs.sh
-            cd ../build_rpm
-            ./build_rpms.sh
-            cd $WORKSPACE
+            run "centos"
+            run "ubuntu"
         ;;
         *)
             echo "Invalid package option"
@@ -89,5 +123,19 @@ echo ""
 echo "Building for $type package in $output_dir"
 echo ""
 
+checking_apex_build
 mkdir -p $output_dir
 build_package $type
+
+# Renaming the rpms in the format kvmfornfv-xxxxxxxx-apex-kernel-4.4.6_rt14.el7.centos.x86_64.rpm
+if [ ${apex_build_flag} -eq 1 ];then
+    cd ${output_dir}
+    echo "Renaming the rpms"
+    source $WORKSPACE/ci/apex.conf
+    echo "${commit_id}"
+    short_hash=`git rev-parse --short=8 ${commit_id}`
+    echo "$short_hash"
+    rename 's/^/kvmfornfv-'${short_hash}'-apex-/' kernel-*
+    variable=`ls kvmfornfv-* | grep "devel" | awk -F "_" '{print $3}' | awk -F "." '{print $1}'`
+    rename "s/${variable}/centos/" kvmfornfv-*
+fi