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

diff --git a/ci/build.sh b/ci/build.sh
index ef06a716c..441acc65d 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -21,6 +21,23 @@ function checking_apex_build() {
     fi
 }
 
+function checking_compass_build() {
+    echo ""
+    commit=`git rev-parse HEAD`
+    echo "commit id: $commit"
+    echo "Checking for presence of compass.conf in the current patch"
+    git diff-tree --no-commit-id --name-only -r ${commit} | grep compass.conf
+    result=`git diff-tree --no-commit-id --name-only -r ${commit} | grep compass.conf`
+    if [ -z "${result}" ]; then
+       echo "Does not include the file compass.conf"
+       compass_build_flag=0
+    else
+       source $WORKSPACE/ci/compass.conf
+       echo "Includes compass.conf"
+       compass_build_flag=1
+    fi
+}
+
 
 function usage() {
     echo ""
@@ -45,16 +62,26 @@ function run() {
          else
             cd $WORKSPACE/ci/
             echo $output_dir
+            cp $WORKSPACE/ci/build_rpm/Dockerfile .
             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
+                         /opt/kvmfornfv/ci/installer_build.sh build_output apex
          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
+         if [ ${compass_build_flag} -eq 0 ]; then
+            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
+         else
+            cd $WORKSPACE/ci/
+            echo $output_dir
+            cp $WORKSPACE/ci/build_deb/Dockerfile .
+            sudo docker build -t kvm_docker .
+            sudo docker run --privileged=true -v $WORKSPACE:/opt/kvmfornfv -t  kvm_docker  \
+                         /opt/kvmfornfv/ci/installer_build.sh build_output compass
+         fi
       ;;
       *) echo "Not supported system"; exit 1;;
    esac
@@ -119,10 +146,13 @@ then
     output_dir=$WORKSPACE/build_output
 fi
 
+job_type=`echo $JOB_NAME | cut -d '-' -f 2`
+
 echo ""
 echo "Building for $type package in $output_dir"
 echo ""
 
+checking_compass_build
 checking_apex_build
 mkdir -p $output_dir
 build_package $type
@@ -139,3 +169,18 @@ if [ ${apex_build_flag} -eq 1 ];then
     variable=`ls kvmfornfv-* | grep "devel" | awk -F "_" '{print $3}' | awk -F "." '{print $1}'`
     rename "s/${variable}/centos/" kvmfornfv-*
 fi
+
+# Uploading rpms only for daily job
+if [ $job_type == "verify" ]; then
+   if [ $type == "centos" ]; then
+      echo "Removing kernel-debuginfo rpm from output_dir"
+      rm -f ${output_dir}/kernel-debug*
+      echo "Checking packages in output_dir"
+      ls -lrth ${output_dir}
+   else
+     echo "Removing debug debian from output_dir"
+     rm -f ${output_dir}/*dbg*
+     echo "Checking packages in output_dir"
+     ls -lrth ${output_dir}
+   fi
+fi