Merge pull request #65 from filecoin-project/move-rolling-build-config-to-composition

move rolling build config to composition file, not manifest

docker-images/Dockerfile.oni-buildbase

@@ -2,7 +2,7 @@ ARG GO_VERSION=1.14.2
 
 FROM golang:${GO_VERSION}-buster
 
-RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config
+RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq gcc git pkg-config bzr
 
 ARG FILECOIN_FFI_COMMIT=ca281af0b6c00314382a75ae869e5cb22c83655b
 ARG FFI_DIR=/extra/filecoin-ffi

lotus-soup/compositions/composition.toml

@@ -5,54 +5,48 @@
 [global]
   plan = "lotus-soup"
   case = "lotus-baseline"
-  total_instances = 3
+  total_instances = 6
   builder = "docker:go"
   runner = "local:docker"
 
+[global.build_config]
+  enable_go_build_cache = true
+
 [[groups]]
   id = "bootstrapper"
-  [groups.resources]
-    memory = "120Mi"
-    cpu = "10m"
   [groups.instances]
     count = 1
     percentage = 0.0
   [groups.run]
     [groups.run.test_params]
       role = "bootstrapper"
-      clients = "1"
-      miners = "1"
+      clients = "3"
+      miners = "2"
       balance = "2000000000"
       sectors = "10"
 
 [[groups]]
   id = "miners"
-  [groups.resources]
-    memory = "120Mi"
-    cpu = "10m"
   [groups.instances]
-    count = 1
+    count = 2
     percentage = 0.0
   [groups.run]
     [groups.run.test_params]
       role = "miner"
-      clients = "1"
-      miners = "1"
+      clients = "3"
+      miners = "2"
       balance = "2000000000"
       sectors = "10"
 
 [[groups]]
   id = "clients"
-  [groups.resources]
-    memory = "120Mi"
-    cpu = "10m"
   [groups.instances]
-    count = 1
+    count = 3
     percentage = 0.0
   [groups.run]
     [groups.run.test_params]
       role = "client"
-      clients = "1"
-      miners = "1"
+      clients = "3"
+      miners = "2"
       balance = "2000000000"
       sectors = "10"

lotus-soup/manifest.toml

@@ -9,8 +9,6 @@ runner = "local:docker"
 enabled = true
 build_base_image = "iptestground/oni-buildbase:v1"
 runtime_image = "iptestground/oni-runtime:v1"
-enable_go_build_cache = true
-skip_runtime_image = false
 
 [runners."local:docker"]
 enabled = true