[backend] generic emulator support to be used as virtualization engine

openSUSE · Feb 3, 2013 · 62cb7f5 · 62cb7f5 · mmohring · Feb 5, 2013
1 parent 3293cc6
commit 62cb7f5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/dist/obsworker b/dist/obsworker
@@ -107,8 +107,12 @@ fi
 
 vmopt=
 
+ARCH=""
 if [ -n "$OBS_VM_TYPE" -a "$OBS_VM_TYPE" != "auto" ] ; then
-    if [ "$OBS_VM_TYPE" != "none" ] ; then
+    if [ "${OBS_VM_TYPE#emulator:}" != "$OBS_VM_TYPE" ] ; then
+        vmopt="--emulator"
+        ARCH="--arch ${OBS_VM_TYPE#emulator:}"
+    elif [ "$OBS_VM_TYPE" != "none" ] ; then
         vmopt="--$OBS_VM_TYPE"
     fi
 elif [ -e /dev/kvm ] ; then
@@ -230,6 +234,7 @@ case "$1" in
 	    echo "screen -t $WORKERID nice -n $OBS_NICE ./bs_worker $vmopt $port --root $R" \
                 "--statedir $workerdir/$I --id $WORKERID $REPO_PARAM $HUGETLBFS $HOSTLABELS" \
                 "$HOSTOWNER $OBS_JOBS $OBS_TEST $OBS_WORKER_OPT $TMPFS $DEVICE $SWAP $MEMORY" \
+                "$ARCH" \
                 >> $screenrc
 	    mkdir -p $workerdir/$I
         done

diff --git a/dist/sysconfig.obs-server b/dist/sysconfig.obs-server
@@ -199,7 +199,7 @@ OBS_WORKER_NICE_LEVEL=18
 
 ## Path:        Applications/OBS
 ## Description: Set used VM type by worker
-## Type:        ("auto" | "xen" | "kvm" | "lxc" | "none")
+## Type:        ("auto" | "xen" | "kvm" | "lxc" | "emulator:$arch" | "none")
 ## Default:     "auto"
 ## Config:      OBS
 #

diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -2059,6 +2059,10 @@ sub dobuild {
     push @args, '--vmdisk-clean'if $vmdisk_clean;
     push @args, '--hugetlbfs', $hugetlbfs if $hugetlbfs;
     push @args, '--statistics';
+  } elsif ($vm =~ /emulator/) {
+    push @args, '--root', "$buildroot/.mount";
+    push @args, '--vm-type', $vm;
+    push @args, '--statistics';
   } elsif ($vm =~ /lxc/) {
     push @args, '--root', $buildroot;
     push @args, '--vm-type', $vm;