From a448d6865c698d6d6c1be0f59db826fe63a427f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Jervidalo?= Date: Fri, 30 Apr 2021 17:47:24 +0200 Subject: [PATCH] feat(travis): Always read properties from Travis triggers (#1090) Travis doesn't need the value of the propertyFile field - it just needs it to be set to some value. Corresponds with https://github.com/spinnaker/orca/pull/4089 --- .../com/netflix/spinnaker/echo/build/BuildInfoService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/echo-core/src/main/java/com/netflix/spinnaker/echo/build/BuildInfoService.java b/echo-core/src/main/java/com/netflix/spinnaker/echo/build/BuildInfoService.java index f69a5d22f..608d0a640 100644 --- a/echo-core/src/main/java/com/netflix/spinnaker/echo/build/BuildInfoService.java +++ b/echo-core/src/main/java/com/netflix/spinnaker/echo/build/BuildInfoService.java @@ -74,8 +74,12 @@ public Map getProperties(BuildEvent event, String propertyFile) String job = event.getContent().getProject().getName(); int buildNumber = event.getBuildNumber(); + if (StringUtils.isEmpty(propertyFile) && master.contains("travis")) { + propertyFile = "travis"; + } + String propertyFileFinal = propertyFile; if (StringUtils.isNoneEmpty(master, job, propertyFile)) { - return retry(() -> igorService.getPropertyFile(buildNumber, propertyFile, master, job)); + return retry(() -> igorService.getPropertyFile(buildNumber, propertyFileFinal, master, job)); } return Collections.emptyMap(); }