distro-tester: external runners

EBWi11 · May 19, 2022 · 6fdd72b · 6fdd72b
1 parent 6133afa
commit 6fdd72b
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 35 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -203,7 +203,7 @@ jobs:
   # Test: TRC-2 with selected kernels.
   #
   CO-RE:
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted
     needs:
       - smoke-test-core
     strategy:
@@ -225,20 +225,21 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
-      - name: "Pull test container image"
-        run: |
-          distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
-          docker image pull rafaeldtinoco/tracee-distro-tester:$distro
+      #- name: "Pull test container image"
+      #  run: |
+      #    distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
+      #    docker image pull rafaeldtinoco/tracee-distro-tester:$distro
       - name: "Run tests"
         run: |
           distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
           docker run --rm --privileged -v $(pwd):/tracee:rw \
-            -e kvm_accel="tcg" \
+            -e kvm_accel="kvm" \
             -e test_name=${{ matrix.signature }} \
             -e non_core=0 \
+            -e cpus=8 -e mem=4 \
             -t rafaeldtinoco/tracee-distro-tester:$distro
   NON-CO-RE:
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted
     needs:
       - smoke-test-noncore
     strategy:
@@ -260,15 +261,17 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
-      - name: "Pull test container image"
-        run: |
-          distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
-          docker image pull rafaeldtinoco/tracee-distro-tester:$distro
+      #- name: "Pull test container image"
+      #  run: |
+      #    distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
+      #    docker image pull rafaeldtinoco/tracee-distro-tester:$distro
       - name: "Run tests"
         run: |
           distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
           docker run --rm --privileged -v $(pwd):/tracee:rw \
-            -e kvm_accel="tcg" \
+            -e kvm_accel="kvm" \
             -e test_name=${{ matrix.signature }} \
             -e non_core=1 \
+            -e cpus=8 -e mem=4 \
             -t rafaeldtinoco/tracee-distro-tester:$distro
+          
diff --git a/.github/workflows/test-core-weekly.yaml b/.github/workflows/test-core-weekly.yaml
@@ -9,7 +9,7 @@ on:
     - cron: '0 4 * * 6'
 jobs:
   CO-RE:
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:
@@ -39,15 +39,16 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
-      - name: "Pull test container image"
-        run: |
-          distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
-          docker image pull rafaeldtinoco/tracee-distro-tester:$distro
+      #- name: "Pull test container image"
+      #  run: |
+      #    distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
+      #    docker image pull rafaeldtinoco/tracee-distro-tester:$distro
       - name: "Run tests"
         run: |
           distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
           docker run --rm --privileged -v $(pwd):/tracee:rw \
-            -e kvm_accel="tcg" \
+            -e kvm_accel="kvm" \
             -e test_name=${{ matrix.signature }} \
             -e non_core=0 \
+            -e cpus=8 -e mem=4 \
             -t rafaeldtinoco/tracee-distro-tester:$distro
diff --git a/.github/workflows/test-noncore-weekly.yaml b/.github/workflows/test-noncore-weekly.yaml
@@ -9,7 +9,7 @@ on:
     - cron: '0 6 * * 6'
 jobs:
   NON-CO-RE:
-    runs-on: ubuntu-20.04
+    runs-on: self-hosted
     strategy:
       fail-fast: false
       matrix:
@@ -39,15 +39,16 @@ jobs:
         uses: actions/checkout@v2
         with:
           submodules: true
-      - name: "Pull test container image"
-        run: |
-          distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
-          docker image pull rafaeldtinoco/tracee-distro-tester:$distro
+      #- name: "Pull test container image"
+      #  run: |
+      #    distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
+      #    docker image pull rafaeldtinoco/tracee-distro-tester:$distro
       - name: "Run tests"
         run: |
           distro=$(echo ${{ matrix.distro }} | cut -d'-' -f1)
           docker run --rm --privileged -v $(pwd):/tracee:rw \
-            -e kvm_accel="tcg" \
+            -e kvm_accel="kvm" \
             -e test_name=${{ matrix.signature }} \
             -e non_core=1 \
+            -e cpus=8 -e mem=4 \
             -t rafaeldtinoco/tracee-distro-tester:$distro
diff --git a/tests/distro-tester/.gitignore b/tests/distro-tester/.gitignore
diff --git a/tests/distro-tester/03-run-qemu.sh b/tests/distro-tester/03-run-qemu.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-# syntax: ./$0 [image] [tracee_dir] [TRC-X] [kvm|tcg] [0|1]
+# syntax: ./$0 [image] [tracee_dir] [TRC-X] [kvm|tcg] [0|1] [cpus] [memory]
 
 . ./00-config
 
@@ -12,6 +12,8 @@ tracee=$2
 testname=$3
 kvmaccel=$4
 isnoncore=$5
+cpus=$6 # optional
+mem=$7 # optional
 
 qemu-img info images/$image | grep -q raw && format="raw"
 qemu-img info images/$image | grep -q qcow2 && format="qcow2"
@@ -21,7 +23,7 @@ error_syntax() {
   echo -n "ERROR: "
   echo $@
   echo ""
-  echo "syntax: $0 [image] [tracee_dir] [TRC-X] [kvm|tcg]"
+  echo "syntax: $0 [image] [tracee_dir] [TRC-X] [kvm|tcg] [0|1] [cpus] [memory]"
   echo ""
   exit 1
 }
@@ -42,10 +44,20 @@ if [[ $kvmaccel != tcg && $kvmaccel != kvm ]]; then
   error_syntax "acceleration should be tcg or kvm"
 fi
 
-if [[ $isnoncore == "" || ( $isnoncore -ne 0 && $isnoncore -ne 1 ) ]]; then
+if [[ $isnoncore -ne 0 && $isnoncore -ne 1 ]]; then
   error_syntax "non core should be either 0 or 1"
 fi
 
+# amount of vpus
+if [[ $cpus -ne 2 && $cpus -ne 4 && $cpus -ne 6 && $cpus -ne 8 ]]; then
+  error_syntax "should provide amount of cpus"
+fi
+
+# amount of memory
+if [[ $mem -ne 2 && $mem -ne 4 && $mem -ne 6 && $mem -ne 8 ]]; then
+  error_syntax "should provide amount of mem"
+fi
+
 mount -t tmpfs -o rw,nosuid,nodev,inode64 tmpfs /dev/shm
 
 rm -f "/tmp/vhostqemu-$image"
@@ -74,9 +86,9 @@ fi
 qemu-system-x86_64 \
   -name guest=$image \
   -machine accel=$kvmaccel \
-  --cpu max --smp cpus=1 -m 2G \
-  -object memory-backend-file,id=mem,size=2G,mem-path=/dev/shm,share=on \
-  -numa node,nodeid=0,cpus=0,memdev=mem \
+  --cpu max --smp $cpus -m ${mem}G \
+  -object memory-backend-file,id=mem,size=${mem}G,mem-path=/dev/shm,share=on \
+  -numa node,nodeid=0,memdev=mem \
   -rtc base=utc,clock=vm,driftfix=none \
   -boot c \
   -display none \

diff --git a/tests/distro-tester/files/docker-entrypoint.sh b/tests/distro-tester/files/docker-entrypoint.sh
@@ -38,6 +38,6 @@ fi
 
 cd /tester
 
-./03-run-qemu.sh $image_name /tracee $test_name $kvm_accel $non_core | tee /tmp/qemu.log
+./03-run-qemu.sh $image_name /tracee $test_name $kvm_accel $non_core $cpus $mem | tee /tmp/qemu.log
 
 # vi:syntax=sh:expandtab:smarttab:tabstop=2:shiftwidth=2:softtabstop=2

diff --git a/tests/distro-tester/images-copy/.gitignore b/tests/distro-tester/images-copy/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/tests/distro-tester/images-full/.gitignore b/tests/distro-tester/images-full/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/tests/distro-tester/images/.gitignore b/tests/distro-tester/images/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/tests/distro-tester/kernels-copy/.gitignore b/tests/distro-tester/kernels-copy/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/tests/distro-tester/kernels/.gitignore b/tests/distro-tester/kernels/.gitignore
@@ -0,0 +1 @@
+*