X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=blobdiff_plain;f=ci%2Finstaller_build.sh;fp=ci%2Fapex_build.sh;h=ca0fea1d75f8c1dd666e39eba12b78fe2287d6ab;hp=abeac7f9f3fcd1e8ff19ebcde0a874df5d040222;hb=4525b15e86b4c7e2d426988c4ec1a11132a9f51b;hpb=465249b61b72d33fe1fad8d43da332faef22bec0 diff --git a/ci/apex_build.sh b/ci/installer_build.sh similarity index 61% rename from ci/apex_build.sh rename to ci/installer_build.sh index abeac7f9f..ca0fea1d7 100755 --- a/ci/apex_build.sh +++ b/ci/installer_build.sh @@ -1,10 +1,16 @@ #!/bin/bash +output_dir="$1" +installer_type="$2" function checkout_commit() { build_dir=/opt/kvmfornfv/ mkdir -p /tmp/kvmfornfv SRC=/tmp/kvmfornfv -source ${build_dir}/ci/apex.conf +if [[ "$installer_type" == "apex" ]];then + source ${build_dir}/ci/apex.conf +else + source ${build_dir}/ci/compass.conf +fi #Cloning into /tmp/kvmfornfv cd $SRC if [[ "$branch" == "master" ]] || [[ "$branch" == *"danube"* ]];then @@ -14,28 +20,24 @@ if [[ "$branch" == "master" ]] || [[ "$branch" == *"danube"* ]];then echo "Commit-id is ${commit_id}" git checkout -f ${commit_id} if [ $? -ne 0 ];then - echo "Please check the commit-id provided in apex.conf" + echo "Please check the commit-id provided in installer conf file" exit 1 fi fi mkdir ${output_dir} } -output_dir="$1" checkout_commit kernel_src_dir=$SRC/kernel -rpmbuild_dir=$SRC/kvmfornfv_rpmbuild.$$ -artifact_dir=${rpmbuild_dir}/RPMS/x86_64 -mkdir -p $artifact_dir config_file="${kernel_src_dir}/arch/x86/configs/opnfv.config" +cp -f ${config_file} "${kernel_src_dir}/.config" usage () { echo "usage: ${0} output_dir" exit 1 } - if [[ -z "$@" ]]; then usage fi @@ -61,7 +63,10 @@ echo echo "Build" echo -cp -f ${config_file} "${kernel_src_dir}/.config" +function apex_rpm_build (){ +rpmbuild_dir=$SRC/kvmfornfv_rpmbuild.$$ +artifact_dir=${rpmbuild_dir}/RPMS/x86_64 +mkdir -p $artifact_dir # Make timestamp part of version string for automated kernel boot verification date "+-%y%m%d%H%M" > "${kernel_src_dir}/localversion-zzz" @@ -79,3 +84,55 @@ mv ${output_dir}/* ${build_dir}/build_output/ rm -rf ${rpmbuild_dir} #cleaning the /tmp rm -rf ${SRC} +} + +function compass_deb_build(){ +cd ${kernel_src_dir} +make oldconfig + +quirks(){ + # + # Apply out of tree patches + # + echo "Inside quirks" + for i in $SRC/kvmfornfv/patches/$1/*.patch + do + if [ -f "$i" ] + then + echo "Applying: $i" + patch -p1 <$i + fi + done + echo "end quirks" +} +quirks kernel + +echo "SRC is:$SRC" +echo "kernel_src_dir is : $kernel_src_dir" + +VERSION="1.0.OPNFV" +# Configure the kernel +cd $kernel_src_dir + +# Workaround build bug on Ubuntu 14.04 +cat < arch/x86/boot/install.sh +#!/bin/sh +cp -a -- "\$2" "\$4/vmlinuz-\$1" +EOF + +# Build the kernel debs +make-kpkg clean +fakeroot make-kpkg --initrd --revision=$VERSION kernel_image kernel_headers kernel_debug -j$(nproc) +make + +echo "list the debians built" +ls -lrth $SRC +mv $SRC/linux-* $build_dir/build_output +} + +if [[ "$installer_type" == "apex" ]];then + apex_rpm_build +else + compass_deb_build +fi +