Bake-in the basic kernel module

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>

diff --git a/scripts/system-tests/build-kernel.sh b/scripts/system-tests/build-kernel.sh
index 1c435b32ce76dbd2ace16075b3c2c1779cd86efc..219eb4289b1beb8eba45e805c9b2570825697fce 100644 (file)
--- a/scripts/system-tests/build-kernel.sh
+++ b/scripts/system-tests/build-kernel.sh
@@ -17,20 +17,15 @@
 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"

diff --git a/scripts/system-tests/check-build-needs.sh b/scripts/system-tests/check-build-needs.sh
index cf51ab2ace0df6a14443ad910c5a4fd642bea679..6ad7a8c10cd8a315bd19f7b39c75badd24962786 100644 (file)
--- a/scripts/system-tests/check-build-needs.sh
+++ b/scripts/system-tests/check-build-needs.sh
@@ -64,7 +64,8 @@ if [ $NEED_MODULES_BUILD -eq 1 ] || [ $NEED_KERNEL_BUILD -eq 1 ] ; then
     make --directory="$LINUX_PATH" kvmconfig
   fi
 
-  make --directory="$LINUX_PATH" modules_prepare
+  # Embed everything
+  make --directory="$LINUX_PATH" localyesconfig
 fi
 
 #We create files to specify what needs to be built for the subsequent build steps

diff --git a/scripts/system-tests/lava-submit.py b/scripts/system-tests/lava-submit.py
index 7de270335a1e47a03eaaaa2efbded257b023e872..cb1f7794dc533862a0934a0d1692201274169afa 100644 (file)
--- a/scripts/system-tests/lava-submit.py
+++ b/scripts/system-tests/lava-submit.py
@@ -314,7 +314,7 @@ def get_results_cmd(stream_name):
     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': {},
@@ -328,14 +328,13 @@ def get_deploy_cmd_kvm(jenkins_job, kernel_path, linux_modules_path, lttng_modul
                 }
             })
 
-    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': {},
@@ -347,7 +346,6 @@ def get_deploy_cmd_x86(jenkins_job, kernel_path, linux_modules_path, lttng_modul
                 }
             })
 
-    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
@@ -404,7 +402,6 @@ def main():
     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)
@@ -431,13 +428,13 @@ def main():
 
     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())
 

diff --git a/scripts/system-tests/lava2-submit.py b/scripts/system-tests/lava2-submit.py
index f5a61d3c265b3134203a32ff95147a072aaaaddb..47cc61080416f31f386baf0269903218b963364f 100644 (file)
--- a/scripts/system-tests/lava2-submit.py
+++ b/scripts/system-tests/lava2-submit.py
@@ -189,7 +189,6 @@ def main():
     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)
@@ -247,7 +246,6 @@ def main():
     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
 

diff --git a/scripts/system-tests/template_lava_job.jinja2 b/scripts/system-tests/template_lava_job.jinja2
index cd136ac687f32ae97c49b14c737ecbc86407895c..8d9f02595a27273a477af03b2a876635b2547d42 100644 (file)
--- a/scripts/system-tests/template_lava_job.jinja2
+++ b/scripts/system-tests/template_lava_job.jinja2
@@ -34,10 +34,6 @@ actions:
         kernel:
           url: {{ kernel_url }}
           type: zimage
-        modules:
-          url: {{ linux_modules_url }}
-          archive: tar
-          compression: gz
         modules:
           url: {{ lttng_modules_url }}
           archive: tar