From 4bd90e6b68facb74cc9dd4b81ab8cc7b713d3af1 Mon Sep 17 00:00:00 2001 From: Erik Hochstedt Date: Mon, 18 Sep 2017 09:21:29 -0400 Subject: [PATCH] Fix logic in where builds push to DHE --- dev/build.image/build.gradle | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dev/build.image/build.gradle b/dev/build.image/build.gradle index d118f2aa6119..e2e665a2c8d5 100644 --- a/dev/build.image/build.gradle +++ b/dev/build.image/build.gradle @@ -178,8 +178,8 @@ remotes { file("${rootDir}/generated.properties").withInputStream { props.load(it) } host = props.getProperty("dhe.server") - user = props.getProperty("intranet.user") - password = props.getProperty("intranet.password") + user = props.getProperty("dhe.user") + password = props.getProperty("dhe.password") knownHosts = allowAnyHosts } } @@ -202,15 +202,13 @@ task publishPublicArtifactsOnDhe { String version = "${yr}-${mo}-${d}_${t}" String packageName = null if (isRelease) { - packageName = props.getProperty("published.package.release") - } else if (isContinuousBuild) { packageName = props.getProperty("published.package.nightly") } else { packageName = props.getProperty("published.package.personal") version = props.getProperty("buildResultUUID") } - String userAtHost = props.getProperty("intranet.user") + "@" + props.getProperty("dhe.server") + String userAtHost = props.getProperty("dhe.user") + "@" + props.getProperty("dhe.server") String dir = "/www/stage/export/pub/software/openliberty/runtime" String publicDHEUrl = "http://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime" String dest = userAtHost + ":" + dir