Merge pull request #25 from screwdriver-cd/custom

fix: pull in new executor-k8s-vm with custom cpu and ram

Author: minzcmu

config/custom-environment-variables.yaml

@@ -79,12 +79,16 @@ executor:
                     low: K8S_CPU_LOW
                     high: K8S_CPU_HIGH
                     turbo: K8S_CPU_TURBO
+                    # upper bound for user custom cpu
+                    max: K8S_CPU_MAX
                 # Memory in GB
                 memory:
                     micro: K8S_MEMORY_MICRO
                     low: K8S_MEMORY_LOW
                     high: K8S_MEMORY_HIGH
                     turbo: K8S_MEMORY_TURBO
+                    # upper bound for user custom memory
+                    max: K8S_MEMORY_MAX
                 disk:
                   high: K8S_DISK_LABEL
                   speed: K8S_DISK_SPEED_LABEL

config/default.yaml

@@ -51,12 +51,16 @@ executor:
                     low: 2
                     high: 6
                     turbo: 12
+                    # upper bound for user custom cpu
+                    max: 12
                 memory:
                     # Memory in GB
                     micro: 1
                     low: 2
                     high: 12
                     turbo: 16
+                    # upper bound for user custom memory
+                    max: 16
             # Default build timeout for all builds in this cluster
             buildTimeout: 90
             # Default max build timeout

package.json

@@ -37,7 +37,7 @@
     "eslint-config-screwdriver": "^3.0.0",
     "jenkins-mocha": "^6.0.0",
     "mockery": "^2.1.0",
-    "sinon": "^7.1.1"
+    "sinon": "^7.2.5"
   },
   "dependencies": {
     "amqp-connection-manager": "^2.2.0",
@@ -49,10 +49,9 @@
     "request": "^2.88.0",
     "screwdriver-executor-k8s": "^13.3.5",
     "screwdriver-executor-k8s-vm": "^2.8.4",
-    "screwdriver-executor-router": "^1.0.8",
-    "sinon": "^7.1.1",
-    "threads": "^0.12.0",
-    "winston": "^3.1.0"
+    "screwdriver-executor-router": "^1.0.11",
+    "threads": "^0.12.1",
+    "winston": "^3.2.1"
   },
   "release": {
     "debug": false,