diff options
| -rw-r--r-- | ci/Dockerfile | 18 | ||||
| -rwxr-xr-x | ci/build.sh | 40 | ||||
| -rwxr-xr-x | ci/compass.conf | 2 | ||||
| -rwxr-xr-x | ci/installer_build.sh (renamed from ci/apex_build.sh) | 73 | ||||
| -rwxr-xr-x | ci/test_kvmfornfv.sh | 12 |
5 files changed, 113 insertions, 32 deletions
diff --git a/ci/Dockerfile b/ci/Dockerfile deleted file mode 100644 index 04c46b5b1..000000000 --- a/ci/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -FROM centos -RUN yum -y update && yum -y install \ - git \ - gcc \ - gcc-c++ \ - zlib-devel \ - gtk2-devel \ - glib2-devel \ - make \ - gettext \ - openssl-devel \ - bc \ - bison\ - flex\ - rpm \ - rpm-build
\ No newline at end of file diff --git a/ci/build.sh b/ci/build.sh index a52055940..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 @@ -125,6 +152,7 @@ echo "" echo "Building for $type package in $output_dir" echo "" +checking_compass_build checking_apex_build mkdir -p $output_dir build_package $type @@ -155,4 +183,4 @@ if [ $job_type == "verify" ]; then echo "Checking packages in output_dir" ls -lrth ${output_dir} fi -fi
\ No newline at end of file +fi diff --git a/ci/compass.conf b/ci/compass.conf new file mode 100755 index 000000000..03d2b791a --- /dev/null +++ b/ci/compass.conf @@ -0,0 +1,2 @@ +branch=master +commit_id=4bfeded9ee7ddc1cf05f6bd2c388894a7d736291 diff --git a/ci/apex_build.sh b/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 <<EOF > 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 + diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh index 62b5c16f4..6540b18ca 100755 --- a/ci/test_kvmfornfv.sh +++ b/ci/test_kvmfornfv.sh @@ -20,6 +20,14 @@ cyclictest_result=0 #exit code of cyclictest packetforward_result=0 #exit code of packet forward source $WORKSPACE/ci/envs/host-config +#check if any kernel rpms available for testing +rpm_count=`ls -1 $WORKSPACE/build_output/*.rpm 2>/dev/null | wc -l` +if [ $rpm_count = 0 ];then + echo "This patch is used for building kernel debian packages required by compass installer and \ +the test environment for testing debain packages is not available" + exit 0 +fi + function packetForward { #executing packet forwarding test cases based on the job type. if [ ${test_type} == "verify" ];then @@ -140,6 +148,8 @@ if [ ${test_type} == "verify" ];then test_exit 0 fi elif [ ${test_type} == "daily" ];then + echo "Daily job test cases execution disabled temporarily" + exit 0 getTestParams install_pcm if [ ${test_name} == "packet_forward" ];then @@ -163,6 +173,8 @@ elif [ ${test_type} == "daily" ];then sed -i '/host-setup1.sh/a\ \- \"enable-trace.sh\"' kvmfornfv_cyclictest_hostenv_guestenv.yaml #Executing cyclictest through yardstick. cyclictest ${env} + #disabling ftrace and collecting the logs to upload to artifact repository. + ftrace_disable sleep 5 done else |