From d4e83fc00a40fed685734669f4371cac652d7060 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 15 Sep 2019 20:56:14 +0100 Subject: [PATCH] GIS-1621 - Use one object to define hosted FTP site --- publish/do.groovy | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/publish/do.groovy b/publish/do.groovy index 166a74b..681c809 100644 --- a/publish/do.groovy +++ b/publish/do.groovy @@ -1,5 +1,7 @@ import groovy.io.FileType +hostedftb = load("${autobuilder.commonscripts()}/remoteaccess/hostedftp.groovy") + markunstable = false unstablereason = "" @@ -88,15 +90,12 @@ def getcomponentartifacts(releaseinfo, String repofolder, itempathstopublish) { def publish(String customer, String finalreleaserepofolder = releaserepofolder) { summaryappend(" FTP operations: ") - def String FTP_CLIENT_LOCATION='ftp' - def String FTP_URL='ie1.hostedftp.com' - def String FTP_USER='ftp@globalinkjetsystems.com' - def String FTP_CUSTOMER_ROOT="/Customers/${customer}" - def String FTP_PASSWORD='ramshorn42' + def hostedftpsiteinfo = hostedftb.getHostedFTPSiteInfo() + def String ftproot = "${hostedftpsiteinfo.workingdirectory}${customer}" dir(finalreleaserepofolder) { - summaryappend("FTP operations: Transferring to ${FTP_CUSTOMER_ROOT}") + summaryappend("FTP operations: Transferring to ${ftproot}") sh """#!/bin/bash - ncftpput -u ${FTP_USER} -p ${FTP_PASSWORD} -R ${FTP_URL} "${FTP_CUSTOMER_ROOT}" . + ncftpput -u ${hostedftpsiteinfo.username} -p ${hostedftpsiteinfo.password} -R ${hostedftpsiteinfo.url} "${ftproot}" . """ summaryappend(", Transferred ") }