diff options
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/apex.conf | 4 | ||||
| -rwxr-xr-x | ci/build.sh | 17 | ||||
| -rwxr-xr-x | ci/envs/cyclictest.sh | 7 | ||||
| -rwxr-xr-x | ci/envs/guest-setup1.sh | 3 | ||||
| -rwxr-xr-x | ci/kernel_build.sh | 2 | ||||
| -rwxr-xr-x | ci/kernel_debug.sh | 16 |
6 files changed, 46 insertions, 3 deletions
diff --git a/ci/apex.conf b/ci/apex.conf index 03e5830bc..03d2b791a 100644 --- a/ci/apex.conf +++ b/ci/apex.conf @@ -1,2 +1,2 @@ -branch=stable/danube -commit_id=977317100f3b52caafb091ad5924e5dd81982433 +branch=master +commit_id=4bfeded9ee7ddc1cf05f6bd2c388894a7d736291 diff --git a/ci/build.sh b/ci/build.sh index ef06a716c..a52055940 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -119,6 +119,8 @@ 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 "" @@ -139,3 +141,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
\ No newline at end of file diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh index 920a46b93..d1ae5c7fa 100755 --- a/ci/envs/cyclictest.sh +++ b/ci/envs/cyclictest.sh @@ -11,6 +11,7 @@ testName=$2 #idle_idle/stress_idle HOST_IP=$( getHostIP ) pod_config='/opt/scripts/pod.yaml' cyclictest_context_file='/opt/kvmfornfv_cyclictest_'${testName}'.yaml' +yardstick_prefix='/root/yardstick/yardstick/benchmark/scenarios/compute' # yardstick teardown path if [ ! -f ${pod_config} ] ; then echo "file ${pod_config} not found" @@ -22,6 +23,12 @@ if [ ! -f ${cyclictest_context_file} ] ; then exit 1 fi +#As yardstick executes only *.bash scripts, copy the post-execute script as .bash script +cp /opt/scripts/disable_trace.sh ${yardstick_prefix}/disable_trace.bash + +#Execution of the post-execute script copied requires re-installation of yardstick +( cd /root/yardstick ; python setup.py install ) + #setting up of image for launching guest vm. ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \ root@$HOST_IP "cp /root/images/guest1.qcow2 /root/" diff --git a/ci/envs/guest-setup1.sh b/ci/envs/guest-setup1.sh index 678baa43b..6d790a080 100755 --- a/ci/envs/guest-setup1.sh +++ b/ci/envs/guest-setup1.sh @@ -24,3 +24,6 @@ set_irq_affinity # Disable RT throttling echo -1 > /proc/sys/kernel/sched_rt_period_us echo -1 > /proc/sys/kernel/sched_rt_runtime_us + +# Disable the timer migration +echo 0 > /proc/sys/kernel/timer_migration diff --git a/ci/kernel_build.sh b/ci/kernel_build.sh index 91e8b7765..6071ca760 100755 --- a/ci/kernel_build.sh +++ b/ci/kernel_build.sh @@ -50,7 +50,7 @@ EOF # Build the kernel debs make-kpkg clean -fakeroot make-kpkg --initrd --revision=$VERSION kernel_image kernel_headers +fakeroot make-kpkg --initrd --revision=$VERSION kernel_image kernel_headers kernel_debug -j$(nproc) make mv /root/kvmfornfv/linux-* /root/kvmfornfv/build_output } diff --git a/ci/kernel_debug.sh b/ci/kernel_debug.sh new file mode 100755 index 000000000..5ccf1af76 --- /dev/null +++ b/ci/kernel_debug.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +tmpdir=$1 #/tmp/kvmfornfv_rpmbuild.1/BUILD/kernel-4.4.50_rt62nfv +OBJCOPY=objcopy +if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then +for module in $(find $tmpdir/lib/modules/ -name *.ko -printf '%P\n'); do + module=lib/modules/$module + mkdir -p $(dirname $tmpdir/usr/lib/debug/$module) + # only keep debug symbols in the debug file + $OBJCOPY --only-keep-debug $tmpdir/$module $tmpdir/usr/lib/debug/$module + # strip original module from debug symbols + $OBJCOPY --strip-debug $tmpdir/$module + # then add a link to those + $OBJCOPY --add-gnu-debuglink=$tmpdir/usr/lib/debug/$module $tmpdir/$module + done +fi
\ No newline at end of file |