Copy source to VMs

Author: vladbogo

master-bintars/master.cfg

@@ -113,39 +113,47 @@ c["workers"].append(mkWorker("monty-bbw1-x64", max_builds=1, properties={"jobs":
 
 
 ####### FACTORY CODE
-def getport():
-    # TODO Dummy implementation, replace with actual logic to get a port
-    return "12345"
-
-
 def memory_def():
     # TODO Dummy implementation, replace with actual logic to define memory
     return "2048"
 
 
 gccWarningPattern = "^(.*?):([0-9]+):(?:[0-9]+:)? [Ww]arning: (.*)$"
+kvm_scpopt = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
 
-# TODO - replace with actual implementation
-def ScpSourceIntoVM():
-    return "scp source.zip buildbot@vm:/path/to/destination"
+def ScpSourceIntoVM(port):
+    return util.Interpolate(
+        "= scp -P "
+        + port
+        + " "
+        + kvm_scpopt
+        + " /mnt/packages/%(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz buildbot@localhost:buildbot/"
+    )
 
 
 def getBintarBuilder(
-    name, kvm_image, cpu, ramdisk=True, catg="main", cmake="", suffix=""
+    name,
+    kvm_image,
+    cpu,
+    ramdisk=True,
+    catg="main",
+    cmake="",
+    suffix="",
+    port="10000",
 ):
     bin_fact = util.BuildFactory()
 
     args = [
-        "--port=" + getport(),
+        "--port=" + port,
         "--memory=" + memory_def(),
         "--user=buildbot",
         "--cpu=" + cpu,
         "--smp=4",
-        "--logfile=kernel_" + getport() + ".log",
+        "--logfile=kernel_" + port + ".log",
     ]
     if ramdisk:
-        args.append("--work-image=/dev/shm/vm-tmp-" + getport() + ".qcow2")
+        args.append("--work-image=/dev/shm/vm-tmp-" + port + ".qcow2")
 
     kvm_image_test = kvm_image.replace("vm-centos5", "vm-centos6")
 
@@ -172,16 +180,21 @@ def getBintarBuilder(
             description=["making", "bintar"],
             descriptionDone=["make", "bintar"],
             timeout=3600,
-            logfiles={"kernel": "kernel_" + getport() + ".log"},
+            logfiles={"kernel": "kernel_" + port + ".log"},
             env={"TERM": "vt102"},
             command=["runvm"]
             + args
             + [
                 "--base-image=/kvm/vms/" + kvm_image + "-build.qcow2",
-                "vm-tmp-" + getport() + ".qcow2",
+                "vm-tmp-" + port + ".qcow2",
+                "rm -Rf buildbot && mkdir buildbot",
+                ScpSourceIntoVM(port),
+                util.Interpolate(
+                    "tar -xvzf %(prop:tarbuildnum)s_%(prop:mariadb_version)s.tar.gz --strip-components=1"
+                ),
                 util.Interpolate(
                     """
- ls
+ ls buildbot
  """
                 ),
             ],
@@ -200,12 +213,14 @@ f_1210_bintar = getBintarBuilder(
     kvm_image="vm-quantal-amd64",
     cpu="host",
     ramdisk=True,
+    port="10001",
 )
 f_1604_bintar = getBintarBuilder(
     name="amd64-kvm-ubuntu-1604-bintar",
     kvm_image="vm-quantal-amd64",
     cpu="host",
     ramdisk=True,
+    port="10002",
 )
 
 c["builders"].append(