screwdriver-api 7.0.207 → 7.0.209

package/config/custom-environment-variables.yaml

@@ -186,6 +186,52 @@ executor:
       launchVersion: LAUNCH_VERSION
       # Prefix to the container
       prefix: EXECUTOR_PREFIX
+  k8s-vm:
+    enabled: EXECUTOR_K8SVM_ENABLED
+    options:
+      # Configuration of Docker
+      kubernetes:
+        # The host or IP of the kubernetes cluster
+        host: K8S_HOST
+        # The jwt token used for authenticating kubernetes requests
+        token: K8S_TOKEN
+        jobsNamespace: K8S_JOBS_NAMESPACE
+        baseImage: K8S_BASE_IMAGE
+        # Resources for build pod
+        resources:
+          # Number of cpu cores
+          cpu:
+            micro: K8S_CPU_MICRO
+            low: K8S_CPU_LOW
+            high: K8S_CPU_HIGH
+          # Memory in GB
+          memory:
+            micro: K8S_MEMORY_MICRO
+            low: K8S_MEMORY_LOW
+            high: K8S_MEMORY_HIGH
+        # Default build timeout for all builds in this cluster
+        buildTimeout: K8S_VM_BUILD_TIMEOUT
+        # Default max build timeout
+        maxBuildTimeout: K8S_VM_MAX_BUILD_TIMEOUT
+        # k8s node selectors for build pod scheduling.
+        # Value is Object of format { label: 'value' } See
+        # https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#step-one-attach-label-to-the-node
+        # Eg: { dedicated: 'screwdriver' } to schedule pods on nodes having
+        # label-value of dedicated=screwdriver
+        nodeSelectors:
+          __name: K8S_VM_NODE_SELECTORS
+          __format: json
+        # k8s preferred node selectors for build pod scheduling
+        # See https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#node-affinity-beta-feature
+        preferredNodeSelectors:
+          __name: K8S_VM_PREFERRED_NODE_SELECTORS
+          __format: json
+      # Launcher image to use
+      launchImage: LAUNCH_IMAGE
+      # Launcher container tag to use
+      launchVersion: LAUNCH_VERSION
+      # Prefix to the container
+      prefix: EXECUTOR_PREFIX
   jenkins:
     enabled: EXECUTOR_JENKINS_ENABLED
     options:

package/config/default.yaml

@@ -157,6 +157,38 @@ executor:
       docker: {}
       # Container tags to use
       launchVersion: stable
+  k8s-vm:
+    enabled: true
+    options:
+      # Configuration of Docker
+      kubernetes:
+        # The host or IP of the kubernetes cluster
+        host: kubernetes.default
+        # The jwt token used for authenticating kubernetes requests
+        # Loaded from /var/run/secrets/kubernetes.io/serviceaccount/token by default
+        # Resources for build pod
+        resources:
+          # Number of cpu cores
+          cpu:
+            micro: 1
+            low: 2
+            high: 6
+          # Memory in GB
+          memory:
+            micro: 1
+            low: 2
+            high: 12
+        # Default build timeout for all builds in this cluster (in minutes)
+        buildTimeout: 90
+        # Default max build timeout (in minutes)
+        maxBuildTimeout: 120
+        # k8s node selectors for appropriate pod scheduling
+        nodeSelectors: {}
+        preferredNodeSelectors: {}
+      # Launcher image to use
+      launchImage: screwdrivercd/launcher
+      # Launcher container tag to use
+      launchVersion: stable
 #   jenkins:
 #     options:
 #       # Configuration of Jenkins

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.207",
+  "version": "7.0.209",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -37,6 +37,7 @@
       "screwdriver-datastore-sequelize",
       "screwdriver-executor-docker",
       "screwdriver-executor-k8s",
+      "screwdriver-executor-k8s-vm",
       "screwdriver-executor-queue",
       "screwdriver-executor-router",
       "screwdriver-models",
@@ -113,6 +114,7 @@
     "screwdriver-executor-base": "^10.0.0",
     "screwdriver-executor-docker": "^7.0.0",
     "screwdriver-executor-k8s": "^16.0.0",
+    "screwdriver-executor-k8s-vm": "^5.0.0",
     "screwdriver-executor-queue": "^5.0.0",
     "screwdriver-executor-router": "^4.0.0",
     "screwdriver-logger": "^2.0.0",

package/plugins/pipelines/README.md

@@ -111,6 +111,7 @@ Query Params:
 * `type` - *Optional* Get pipeline or pr events (default `pipeline`)
 * `prNum` - *Optional* Return only PR events of specified PR number
 * `sha` - *Optional* Search `sha` and `configPipelineSha` for events
+* `groupEventId` - *Optional* Return only events with a specified groupEventId
 * `id` - *Optional* Fetch specific event ID; alternatively can use greater than(`gt:`) or less than(`lt:`) prefix
 
 `GET /pipelines/{id}/events?page={pageNumber}&count={countNumber}&sort={sort}&type={type}&prNum={prNumber}&sha={sha}`

package/plugins/pipelines/listEvents.js

@@ -34,7 +34,7 @@ module.exports = () => ({
 
         handler: async (request, h) => {
             const factory = request.server.app.pipelineFactory;
-            const { page, count, sha, prNum, id, sort, sortBy } = request.query;
+            const { page, count, sha, prNum, id, sort, sortBy, groupEventId } = request.query;
 
             return factory
                 .get(request.params.id)
@@ -71,7 +71,11 @@ module.exports = () => ({
                         };
                     }
 
-                    // Event id filter
+                    if (groupEventId) {
+                        config.params.groupEventId = groupEventId;
+                    }
+
+                    // Event id filter; can use greater than(`gt:`) or less than(`lt:`) prefix
                     if (id) {
                         config.params.id = id;
                     }
@@ -96,6 +100,7 @@ module.exports = () => ({
                     prNum: prNumSchema,
                     sha: shaSchema,
                     id: queryIdSchema,
+                    groupEventId: pipelineIdSchema,
                     search: joi.forbidden(), // we don't support search for Pipeline list events
                     getCount: joi.forbidden() // we don't support getCount for Pipeline list events
                 })