Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix logic in where builds push to DHE #4

Merged
merged 1 commit into from
Sep 18, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions dev/build.image/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand All @@ -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
Expand Down