summary refs log tree commit diff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorCristian Ciocaltea <cristian.ciocaltea@collabora.com>2022-10-26 19:30:51 +0300
committerCristian Ciocaltea <cristian.ciocaltea@collabora.com>2022-12-12 17:57:13 +0200
commit9196ed5bbb5103a3f567d15b321ab071d8cf2aa7 (patch)
tree5411b21aee32bc784b85934136fde8bce09a10dc /.gitlab-ci.yml
parent2e523f6df8a4200fe445401b8227193c9fa8c75e (diff)
downloadlinux-9196ed5bbb5103a3f567d15b321ab071d8cf2aa7.tar.gz
gitlab-ci: Increase CPU count in QEMU instance
Adjust QEMU SMP to maximum number of available processing units on the
CI job runner, minus one. This helps reducing the time spent for building
sources inside QEMU instance.

Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de363ef930ae..a2cbeb74ca6c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,14 +23,14 @@ kernel build:
   script:
     - make x86_64_defconfig && make kvm_guest.config
     - ./scripts/kconfig/merge_config.sh .config .config-fragment
-    - make -j`nproc`
+    - make -j $(nproc)
     - git rev-parse HEAD &> commit_id_file
     - cp -v arch/x86/boot/bzImage .
     - cp .config kernel_config
     # download rootfs
     - 'curl -L --header "PRIVATE-TOKEN: ${KERNEL_RESEARCH_ROOTFS_TOKEN}" "${ROOTFS_IMAGE_URL}" --output artifact.zip'
     - unzip artifact.zip
-    - qemu-system-x86_64 -enable-kvm -nographic -kernel ${KERNEL} -drive file=${ROOTFS_NAME},format=raw -device virtio-serial-pci -virtfs local,path=$(pwd),mount_tag=steamlogs,security_model=none -m 2G -smp 2 -cpu host -net user,hostfwd=tcp::2222-:22 -net nic,model=virtio --append "root=/dev/sda rw console=ttyS0" &
+    - qemu-system-x86_64 -enable-kvm -nographic -kernel ${KERNEL} -drive file=${ROOTFS_NAME},format=raw -device virtio-serial-pci -virtfs local,path=$(pwd),mount_tag=steamlogs,security_model=none -m 2G -smp $(nproc --ignore=1) -cpu host -net user,hostfwd=tcp::2222-:22 -net nic,model=virtio --append "root=/dev/sda rw console=ttyS0" &
     - QEMU_PID=$!
     - echo "QEMU pid is $QEMU_PID"
     - sleep 90