Revert "Revert "Jvenstad/hosted vespa deployment pipeline""

This reverts commit c6a24ec54ad6a59b5b5c602d9358372c41c314f7.

14 files changed, 21 insertions, 14 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/BuildService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/BuildService.java
index bb2de87796b..e91a5909f80 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/BuildService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/BuildService.java
@@ -4,7 +4,7 @@ package com.yahoo.vespa.hosted.controller.api.integration;
 import com.yahoo.config.provision.ApplicationId;
 
 /**
- * @author jvenstad
+ * @author jonmv
  */
 public interface BuildService {
 
@@ -20,6 +20,11 @@ public interface BuildService {
      */
     JobState stateOf(BuildJob buildJob);
 
+    /**
+     * Returns whether the given build job should be performed by this build service.
+     */
+    default boolean builds(BuildJob buildJob) { return true; }
+
     enum JobState {
 
         /** Job is not running, and may be triggered. */
@@ -37,6 +42,8 @@ public interface BuildService {
     }
 
 
+    // TODO jvenstad: Argh, refactor this, considering the new JobId, etc..
+    // TODO jvenstad: Probably: make jobName JobType instead.
     class BuildJob {
 
         private final ApplicationId applicationId;
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/github/GitHubMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/github/GitHubMock.java
index 9a398ef7cb5..9825887dcf5 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/github/GitHubMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/github/GitHubMock.java
@@ -8,7 +8,7 @@ import java.util.Map;
 import java.util.UUID;
 
 /**
- * @author jvenstad
+ * @author jonmv
  */
 public class GitHubMock implements GitHub {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java
index fdebcca6d83..6888e8ac06d 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/DeploymentIssues.java
@@ -12,7 +12,7 @@ import java.util.Optional;
 /**
  * Represents the people responsible for keeping Vespa up and running in a given organization, etc..
  *
- * @author jvenstad
+ * @author jonmv
  */
 public interface DeploymentIssues {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Issue.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Issue.java
index 086487b8be7..a9bc7868f7a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Issue.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Issue.java
@@ -14,7 +14,7 @@ import java.util.Optional;
  * Represents an issue which needs to reported, typically from the controller, to a responsible party,
  * the identity of which is determined by the propertyId and, possibly, assignee fields.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public class Issue {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/IssueId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/IssueId.java
index 84b441ff4a8..ccb65582d3c 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/IssueId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/IssueId.java
@@ -7,7 +7,7 @@ import java.util.Objects;
  * Used to identify issues stored in some issue tracking system.
  * The {@code value()} and {@code from()} methods should be inverses.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public class IssueId {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Organization.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Organization.java
index 776002f31cb..6dccaec3b7a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Organization.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/Organization.java
@@ -12,7 +12,7 @@ import java.util.Optional;
  * Represents the humans who use this software, and their organization.
  * Lets the software report issues to its caretakers, and provides other useful human resource lookups.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public interface Organization {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/OwnershipIssues.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/OwnershipIssues.java
index 91b5eb89c38..ee17859c0fb 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/OwnershipIssues.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/OwnershipIssues.java
@@ -14,7 +14,7 @@ import java.util.Optional;
  * with reassurance that any misbehaving applications will swiftly be dealt with.
  * Ignored confirmation requests are periodically redirected to humans of higher rank, until they are acknowledged.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public interface OwnershipIssues {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/User.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/User.java
index 82a86de3824..a88a9432c89 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/User.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/organization/User.java
@@ -6,7 +6,7 @@ import java.util.Objects;
 /**
  * Represents a human computer user, typically by UNIX account name.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public class User {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java
index b169194fd40..c5efffd979a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/LoggingDeploymentIssues.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
  * A memory backed implementation of the Issues API which logs changes and does nothing else.
  * 
  * @author bratseth
- * @author jvenstad
+ * @author jonmv
  */
 public class LoggingDeploymentIssues implements DeploymentIssues {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java
index a8320f56fff..2a8b06888b0 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/stubs/MockBuildService.java
@@ -13,7 +13,7 @@ import static com.yahoo.vespa.hosted.controller.api.integration.BuildService.Job
 import static com.yahoo.vespa.hosted.controller.api.integration.BuildService.JobState.running;
 
 /**
- * @author jvenstad
+ * @author jonmv
  */
 public class MockBuildService extends AbstractComponent implements BuildService {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java
index 1cb5cd22b8d..3bcd7298a15 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilter.java
@@ -7,7 +7,7 @@ package com.yahoo.vespa.hosted.controller.api.integration.zone;
  * The methods here return instances of {@link ZoneList}, which extends ZoneFilter, but with accessors and additional filters.
  * This forces the developer to consider which of the filters in this class to apply, prior to processing any zones.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public interface ZoneFilter {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java
index 7f4637e0492..67d2fd14e6b 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneFilterMock.java
@@ -15,7 +15,7 @@ import java.util.stream.Collectors;
 /**
  * A Zones.List implementation which assumes all zones are controllerManaged.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public class ZoneFilterMock implements ZoneList {
 
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java
index 21ac7a654b8..b53b81398c6 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneId.java
@@ -11,7 +11,7 @@ import java.util.Objects;
  *
  * Serialised form is 'environment.region'.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public class ZoneId {
     // TODO: Replace usages of environment + region with usages of this.
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneList.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneList.java
index 27e8a598043..4205f30e995 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneList.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/zone/ZoneList.java
@@ -12,7 +12,7 @@ import java.util.List;
  * This is typically offered after an initial filter from {@link ZoneFilter} has been applied.
  * This forces the developer to consider which zones to process.
  *
- * @author jvenstad
+ * @author jonmv
  */
 public interface ZoneList extends ZoneFilter {