screwdriver-api 7.0.197 → 7.0.199

package/config/custom-environment-variables.yaml

@@ -186,52 +186,6 @@ 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,38 +157,6 @@ 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.197",
+  "version": "7.0.199",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -38,7 +38,6 @@
       "screwdriver-datastore-sequelize",
       "screwdriver-executor-docker",
       "screwdriver-executor-k8s",
-      "screwdriver-executor-k8s-vm",
       "screwdriver-executor-queue",
       "screwdriver-executor-router",
       "screwdriver-models",
@@ -113,7 +112,6 @@
     "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/builds/triggers/helpers.js

@@ -686,8 +686,8 @@ function getSubsequentJobs(workflowGraph, startNode) {
     const nodeToEdgeDestsMap = Object.fromEntries(nodes.map(node => [node.name, []]));
 
     let start = trimJobName(startNode);
-    // In rare cases, WorkflowGraph and startNode may have different start tildes
 
+    // In rare cases, WorkflowGraph and startNode may have different start tildes
     if (!(start in nodeToEdgeDestsMap)) {
         if (start.startsWith('~')) {
             start = start.slice(1);
@@ -704,7 +704,14 @@ function getSubsequentJobs(workflowGraph, startNode) {
 
     const visited = new Set(visiting);
 
-    edges.forEach(edge => nodeToEdgeDestsMap[edge.src].push(edge.dest));
+    edges.forEach(edge => {
+        // this is a temporary fix for the issue where the edge.src is not in the nodes array
+        // TODO: https://github.com/screwdriver-cd/screwdriver/issues/3206
+        if (!nodeToEdgeDestsMap[edge.src]) {
+            nodeToEdgeDestsMap[edge.src] = [];
+        }
+        nodeToEdgeDestsMap[edge.src].push(edge.dest);
+    });
     if (edges.length) {
         while (visiting.length) {
             const currentNode = visiting.pop();