echo 'kernel-built.txt does not exist'
echo 'So we build it'
-make --directory="$LINUX_PATH" "-j$NPROC" bzImage modules
-make --directory="$LINUX_PATH" INSTALL_MOD_PATH="$MODULES_INSTALL_FOLDER" modules_install
+make --directory="$LINUX_PATH" "-j$NPROC" bzImage
cp "$LINUX_PATH"/arch/x86/boot/bzImage "$DEPLOYDIR"/"$KERNEL_COMMIT_ID".bzImage
cp "$LINUX_PATH"/.config "$DEPLOYDIR"/"$KERNEL_COMMIT_ID".config
-tar -czf "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" -C "$MODULES_INSTALL_FOLDER/" lib/
-
$SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.bzImage" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_IMAGE"
$SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.config" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_CONFIG"
-$SCP_COMMAND "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_LINUX_MODULES"
$SCP_COMMAND "$LINUX_PATH/Module.symvers" "$STORAGE_USER@$STORAGE_HOST:$STORAGE_KERNEL_MODULE_SYMVERS"
$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.bzImage" s3://"$S3_STORAGE_KERNEL_IMAGE"
$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.config" s3://"$S3_STORAGE_KERNEL_CONFIG"
-$S3_COMMAND put "$DEPLOYDIR/$KERNEL_COMMIT_ID.linux.modules.tar.gz" s3://"$S3_STORAGE_LINUX_MODULES"
$S3_COMMAND put "$LINUX_PATH/Module.symvers" s3://"$S3_STORAGE_KERNEL_MODULE_SYMVERS"
command['parameters']['stream']='/anonymous/'+stream_name+'/'
return command
-def get_deploy_cmd_kvm(jenkins_job, kernel_path, linux_modules_path, lttng_modules_path):
+def get_deploy_cmd_kvm(jenkins_job, kernel_path, lttng_modules_path):
command = OrderedDict({
'command': 'deploy_kernel',
'metadata': {},
}
})
- command['parameters']['customize'][SCP_PATH+linux_modules_path]=['rootfs:/','archive']
command['parameters']['customize'][SCP_PATH+lttng_modules_path]=['rootfs:/','archive']
command['parameters']['kernel'] = str(SCP_PATH+kernel_path)
command['metadata']['jenkins_jobname'] = jenkins_job
return command
-def get_deploy_cmd_x86(jenkins_job, kernel_path, linux_modules_path, lttng_modules_path, nb_iter=None):
+def get_deploy_cmd_x86(jenkins_job, kernel_path, lttng_modules_path, nb_iter=None):
command = OrderedDict({
'command': 'deploy_kernel',
'metadata': {},
}
})
- command['parameters']['overlays'].append( str(SCP_PATH+linux_modules_path))
command['parameters']['overlays'].append( str(SCP_PATH+lttng_modules_path))
command['parameters']['kernel'] = str(SCP_PATH+kernel_path)
command['metadata']['jenkins_jobname'] = jenkins_job
parser.add_argument('-t', '--type', required=True)
parser.add_argument('-j', '--jobname', required=True)
parser.add_argument('-k', '--kernel', required=True)
- parser.add_argument('-km', '--kmodule', required=True)
parser.add_argument('-lm', '--lmodule', required=True)
parser.add_argument('-tc', '--tools-commit', required=True)
parser.add_argument('-uc', '--ust-commit', required=False)
if test_type is TestType.baremetal_benchmarks:
j = create_new_job(args.jobname, build_device='x86')
- j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.kmodule, args.lmodule))
+ j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.lmodule))
elif test_type is TestType.baremetal_tests:
j = create_new_job(args.jobname, build_device='x86')
- j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.kmodule, args.lmodule))
+ j['actions'].append(get_deploy_cmd_x86(args.jobname, args.kernel, args.lmodule))
elif test_type is TestType.kvm_tests or test_type is TestType.kvm_fuzzing_tests:
j = create_new_job(args.jobname, build_device='kvm')
- j['actions'].append(get_deploy_cmd_kvm(args.jobname, args.kernel, args.kmodule, args.lmodule))
+ j['actions'].append(get_deploy_cmd_kvm(args.jobname, args.kernel, args.lmodule))
j['actions'].append(get_boot_cmd())
parser.add_argument('-t', '--type', required=True)
parser.add_argument('-j', '--jobname', required=True)
parser.add_argument('-k', '--kernel', required=True)
- parser.add_argument('-km', '--kmodule', required=True)
parser.add_argument('-lm', '--lmodule', required=True)
parser.add_argument('-tc', '--tools-commit', required=True)
parser.add_argument('-uc', '--ust-commit', required=False)
context['kernel_url'] = args.kernel
context['nfsrootfs_url'] = nfsrootfs
context['lttng_modules_url'] = args.lmodule
- context['linux_modules_url'] = args.kmodule
context['kprobe_round_nb'] = 10