diff --git a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandler.java b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandler.java index 6dcbafccf..1ff97082d 100644 --- a/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandler.java +++ b/echo-pipelinetriggers/src/main/java/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandler.java @@ -48,7 +48,7 @@ @Slf4j public class BuildEventHandler extends BaseTriggerEventHandler { private static final String[] BUILD_TRIGGER_TYPES = { - "jenkins", "travis", "wercker", "concourse", "gitlab-ci" + "jenkins", "travis", "concourse", "gitlab-ci" }; private static final List supportedTriggerTypes = Collections.unmodifiableList(Arrays.asList(BUILD_TRIGGER_TYPES)); diff --git a/echo-pipelinetriggers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandlerSpec.groovy b/echo-pipelinetriggers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandlerSpec.groovy index 7f04a071f..5ff103cba 100644 --- a/echo-pipelinetriggers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandlerSpec.groovy +++ b/echo-pipelinetriggers/src/test/groovy/com/netflix/spinnaker/echo/pipelinetriggers/eventhandlers/BuildEventHandlerSpec.groovy @@ -65,7 +65,6 @@ class BuildEventHandlerSpec extends Specification implements RetrofitStubs { event | trigger | triggerType createBuildEventWith(SUCCESS) | enabledJenkinsTrigger | 'jenkins' createBuildEventWith(SUCCESS) | enabledTravisTrigger | 'travis' - createBuildEventWith(SUCCESS) | enabledWerckerTrigger | 'wercker' } @Unroll @@ -87,7 +86,6 @@ class BuildEventHandlerSpec extends Specification implements RetrofitStubs { event | pipeline | triggerType | expectedTrigger createBuildEventWith(SUCCESS) | createPipelineWith(enabledJenkinsTrigger, nonJenkinsTrigger) | 'jenkins' | enabledJenkinsTrigger createBuildEventWith(SUCCESS) | createPipelineWith(enabledTravisTrigger, nonJenkinsTrigger) | 'travis' | enabledTravisTrigger - createBuildEventWith(SUCCESS) | createPipelineWith(enabledWerckerTrigger, nonJenkinsTrigger) | 'wercker' | enabledWerckerTrigger createBuildEventWith(SUCCESS) | createPipelineWith(enabledConcourseTrigger, nonJenkinsTrigger) | 'concourse' | enabledConcourseTrigger } @@ -190,7 +188,6 @@ class BuildEventHandlerSpec extends Specification implements RetrofitStubs { trigger | description disabledJenkinsTrigger | "disabled jenkins" disabledTravisTrigger | "disabled travis" - disabledWerckerTrigger | "disabled wercker" disabledConcourseTrigger | "disabled concourse" nonJenkinsTrigger | "non-Jenkins" enabledStashTrigger | "stash" @@ -220,8 +217,6 @@ class BuildEventHandlerSpec extends Specification implements RetrofitStubs { enabledJenkinsTrigger.withJob(null) | "job" | "jenkins" enabledTravisTrigger.withMaster(null) | "master" | "travis" enabledTravisTrigger.withJob(null) | "job" | "travis" - enabledWerckerTrigger.withMaster(null) | "master" | "wercker" - enabledWerckerTrigger.withJob(null) | "job" | "wercker" event = createBuildEventWith(SUCCESS) goodPipeline = createPipelineWith(enabledJenkinsTrigger) diff --git a/echo-test/src/main/groovy/com/netflix/spinnaker/echo/test/RetrofitStubs.groovy b/echo-test/src/main/groovy/com/netflix/spinnaker/echo/test/RetrofitStubs.groovy index 4fadd634f..7cbec602d 100644 --- a/echo-test/src/main/groovy/com/netflix/spinnaker/echo/test/RetrofitStubs.groovy +++ b/echo-test/src/main/groovy/com/netflix/spinnaker/echo/test/RetrofitStubs.groovy @@ -28,8 +28,6 @@ trait RetrofitStubs { final Trigger enabledJenkinsTriggerWithRunAsUser = enabledJenkinsTrigger.withRunAsUser("user@managed-service-account") final Trigger enabledTravisTrigger = Trigger.builder().enabled(true).type('travis').master('master').job('job').build() final Trigger disabledTravisTrigger = Trigger.builder().enabled(false).type('travis').master('master').job('job').build() - final Trigger enabledWerckerTrigger = Trigger.builder().enabled(true).type('wercker').master('master').job('job').build() - final Trigger disabledWerckerTrigger = Trigger.builder().enabled(false).type('wercker').master('master').job('job').build() final Trigger enabledConcourseTrigger = Trigger.builder().enabled(true).type('concourse').master('master').job('job').build() final Trigger disabledConcourseTrigger = Trigger.builder().enabled(false).type('concourse').master('master').job('job').build() final Trigger nonJenkinsTrigger = Trigger.builder().enabled(true).type('not jenkins').master('master').job('job').build()