This commit is contained in:
Dan Hawkins 2019-09-15 23:25:02 +01:00
commit fb132a3eec
9 changed files with 222 additions and 215 deletions

View file

@ -25,12 +25,12 @@ def productuniquefolder(releasemeta) {
return "${releasemeta.productinfo.productname}_${releasemeta.productinfo.subcomponentname}"
}
def uniquereleasefolder(String softwarerelease, releasemeta) {
return "Software/${PRODUCT_NAME} ${softwarerelease}/${productuniquefolder(releasemeta)}"
def uniquereleasefolder(String productline, String softwarerelease, releasemeta) {
return "Software/${productline} ${softwarerelease}/${productuniquefolder(releasemeta)}"
}
def uniqueabsoluterreleasefolder(String releaserepofolder, String softwarerelease, releasemeta) {
return "${releaserepofolder}/${uniquereleasefolder(softwarerelease, releasemeta)}"
def uniqueabsoluterreleasefolder(String productline, String releaserepofolder, String softwarerelease, releasemeta) {
return "${releaserepofolder}/${uniquereleasefolder(productline, softwarerelease, releasemeta)}"
}
def preconditions() {
@ -85,18 +85,14 @@ def getcomponentartifacts(releaseinfo, String repofolder, itempathstopublish) {
}
}
def publish(String customer, String finalreleaserepofolder = releaserepofolder) {
def publish(hostedftpsiteinfo, 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 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 ")
}
@ -116,9 +112,9 @@ def copydirectory(File dirFrom, File dirTo) {
}
}
def recallcomponent(releaseinfo, String softwarerelease, itempathstopublish) {
def recallcomponent(String productline, releaseinfo, String softwarerelease, itempathstopublish) {
def releasemeta = releaseinfo.meta
def String uniquefolderforrepo = uniqueabsoluterreleasefolder(releaserepofolder, softwarerelease, releasemeta)
def String uniquefolderforrepo = uniqueabsoluterreleasefolder(productline, releaserepofolder, softwarerelease, releasemeta)
summaryappend("${releasemeta.productinfo.productname} ${releasemeta.productinfo.subcomponentname}: ")
@ -144,11 +140,12 @@ def convertitemstopublish(String itemstopublishstring) {
// Publish selected items from a release to the customer folder on the ftp site
// itemstopublishstring is a comma-seperated set of strings in this format <ProductName>#<ComponentName>#<PathToPublishableItem>
def publishhierarchy(releasemeta, String itemstopublishstring, String customer, String softwarerelease, String maxdepth) {
def publishhierarchy(hostedftpsiteinfo, releasemeta, String itemstopublishstring, String customer, String softwarerelease, String maxdepth) {
int md = maxdepth.toInteger()
resetfolders()
preconditions()
def productline = releasemeta.productinfo.productname
// Walk the meta information to a max depth, looking for artifacts to publish
def componentReleaseInfoVersionUnique = releasemeta.releasewalkerversionunique(md)
@ -162,16 +159,16 @@ def publishhierarchy(releasemeta, String itemstopublishstring, String customer,
def itempathstopublish = convertitemstopublish(itemstopublishstring)
for (key in componentReleaseInfoVersionUnique.keySet()) {
def releaseinfo = componentReleaseInfoVersionUnique[key]
recallcomponent(releaseinfo, softwarerelease, itempathstopublish)
recallcomponent(productline, releaseinfo, softwarerelease, itempathstopublish)
}
gh.stripgithistory(releaserepofolder)
publish(customer)
publish(hostedftpsiteinfo, customer)
return [summarystring, markunstable, unstablereason]
}
def publishhierarchy(releasemeta, String customer, String softwarerelease, String maxdepth) {
return publishhierarchy(releasemeta, "", customer, softwarerelease, maxdepth)
def publishhierarchy(hostedftpsiteinfo, releasemeta, String customer, String softwarerelease, String maxdepth) {
return publishhierarchy(hostedftpsiteinfo, releasemeta, "", customer, softwarerelease, maxdepth)
}
return this;

View file

@ -1,18 +0,0 @@
ftpremote = load("${autobuilder.commonscripts()}/remoteaccess/ftp.groovy")
def getCustomerListFromFTP(FTPSiteInfo ftpsiteinfo) {
def List<String> customerfilenames = new ArrayList<String>()
def List<String> customers = new ArrayList<String>()
FTPClient ftpclient = ftpremote.createFTPClient(ftpsiteinfo)
customerfilenames = ftpclient.listNames()
for(customer in customerfilenames) {
def String converted = new String(customer.getBytes("ISO-8859-1"), "UTF-8")
customers.add(converted)
}
ftpclient.disconnect()
return customers
}
return this;

View file

@ -4,7 +4,8 @@ pipeline {
stage('Initial setup') {
steps {
script {
meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startnonbuild(this)
autobuilderscript = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy")
meta = autobuilderscript.startnonbuild(this)
}
}
}
@ -35,14 +36,16 @@ pipeline {
script {
hostedftb = load("${autobuilder.commonscripts()}/remoteaccess/hostedftp.groovy")
def List<String> customers = hostedftb.getCustomerList()
customer = input(
message: 'Please select customer to publish to',
ok: 'Ok',
parameters: [
choice(name: 'customer', choices: customers, description: 'Which customer?')
]
)
echo "Chosen customer is: ${customer}"
timeout(time: 10, unit: 'MINUTES') {
customer = input(
message: 'Please select customer to publish to',
ok: 'Ok',
parameters: [
choice(name: 'customer', choices: customers, description: 'Which customer?')
]
)
echo "Chosen customer is: ${customer}"
}
}
}
}
@ -50,15 +53,17 @@ pipeline {
steps {
script {
gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
def List<String> releases = gh.gettaglist(SOURCEDIR)
release = input(
message: 'Please select the software version',
ok: 'Ok',
parameters: [
choice(name: 'release', choices: releases, description: 'Which release?')
]
)
echo "Chosen software version is: ${release}"
def releases = gh.gettaglist(SOURCEDIR)
timeout(time: 10, unit: 'MINUTES') {
release = input(
message: 'Please select the software version',
ok: 'Ok',
parameters: [
choice(name: 'release', choices: releases, description: 'Which software release?')
]
)
echo "Chosen software version is: ${release}"
}
}
}
}
@ -72,7 +77,7 @@ pipeline {
}
}
}
stage('Get release artifact meta') {
stage('Get release artifact info') {
steps {
script {
def mfs = autobuilderscript.getmetafolderscript()
@ -80,11 +85,37 @@ pipeline {
}
}
}
stage('Select which items from software release to publish') {
steps {
script {
publishitems = load("${autobuilder.commonscripts()}/publish/publishitems.groovy")
timeout(time: 10, unit: 'MINUTES') {
def itemsobject = publishitems.createItemSelector(
'Select software items',
'Print Server software items',
releasemeta,
ITEMSDEFAULTLIST,
MAX_META_DEPTH,
'20',
'PT_MULTI_SELECT')
selecteditems = input(
message: 'Select which items from the release are to be published',
ok: 'Ok',
parameters: [
itemsobject.multiSelect()
]
)
echo "Chosen items are: ${selecteditems}"
}
}
}
}
stage('Publish components') {
steps {
script {
def publisher = load("${autobuilder.commonscripts()}/publish/do.groovy")
(summarystring, markunstable, unstablereason) = publisher.publishhierarchy(releasemeta, ITEMS_TO_PUBLISH, customer, release, MAX_META_DEPTH)
def hostedftpsiteinfo = hostedftb.getHostedFTPSiteInfo()
(summarystring, markunstable, unstablereason) = publisher.publishhierarchy(hostedftpsiteinfo, releasemeta, selecteditems, customer, release, MAX_META_DEPTH)
if (markunstable) {
env.unstablereason = unstablereason
currentBuild.result = 'UNSTABLE'

View file

@ -44,7 +44,9 @@ pipeline {
steps {
script {
def publisher = load("${autobuilder.commonscripts()}/publish/do.groovy")
(summarystring, markunstable, unstablereason) = publisher.publishhierarchy(releasemeta, ITEMS_TO_PUBLISH, CUSTOMER, SOFTWARE_RELEASE, MAX_META_DEPTH)
def hostedftb = load("${autobuilder.commonscripts()}/remoteaccess/hostedftp.groovy")
def hostedftpsiteinfo = hostedftb.getHostedFTPSiteInfo()
(summarystring, markunstable, unstablereason) = publisher.publishhierarchy(hostedftpsiteinfo, releasemeta, ITEMS_TO_PUBLISH, CUSTOMER, SOFTWARE_RELEASE, MAX_META_DEPTH)
if (markunstable) {
env.unstablereason = unstablereason
currentBuild.result = 'UNSTABLE'

View file

@ -1,135 +0,0 @@
#!/usr/local/bin/groovy
jobnameext = jobname ?: "jobunique"
metarepoext = metarepo ?: "git@hydra:print-server-releases/print_server_whole.git"
outputselectext = outputselect ?: "description"
metalevelsstringext = metalevels ?: "2"
//jobnameext = "jobunique"
//metarepoext = "git@hydra:print-server-releases/print_server_whole.git"
//outputselectext = "description"
//metalevelsstringext = "2"
metalevelsext = metalevelsstringext.toInteger()
dolog = false
commonscriptsrepo="git@hydra:jenkinsautobuild/Common_scripts.git"
def log(message) {
if (dolog) {
println message
}
}
def createfolder(String folder) {
def sout = new StringBuilder()
def serr = new StringBuilder()
log("Creating directory: ${folder}")
def s = ['mkdir', '-p', folder].execute()
s.consumeProcessOutput(sout, serr)
s.waitFor()
log("Out: ${sout} Err: ${serr}")
return [sout, serr]
}
def gitCloneOrPull(String repo, String folder) {
def sout = new StringBuilder()
def serr = new StringBuilder()
if (!(new File(folder).exists())) {
log("Cloning: ${repo} to: ${folder}")
createfolder(folder)
def s = ['git', 'clone', repo, folder].execute()
s.consumeProcessOutput(sout, serr)
s.waitFor()
} else {
log("Pull in: ${folder}")
def s = ['git', 'pull'].execute(null, new File(folder))
s.consumeProcessOutput(sout, serr)
s.waitFor()
}
log("Out: ${sout} Err: ${serr}")
return [sout, serr]
}
def loadmetaclass(String commonscripts, String metafolder) {
def metafolderscriptfile = "${commonscripts}/meta/folder.groovy"
GroovyShell shell = new GroovyShell()
def metafolderscript = shell.parse(new File(metafolderscriptfile))
def meta = metafolderscript.metafromfolderSlurper(metafolder)
return meta
}
def makeworking() {
def r = ['whoami'].execute()
r.waitFor()
def user = r.text.trim()
def rootfolder = "/home/${user}/tmp"
createfolder(rootfolder)
def commonscripts = "${rootfolder}/commonscripts"
gitCloneOrPull(commonscriptsrepo, commonscripts)
// Clone or pull the relevant meta repo
def metareporoot = "${rootfolder}/${jobnameext}"
gitCloneOrPull(metarepoext, metareporoot)
def metafolder = "${metareporoot}/meta"
// Load the meta folder class that interprets the meta repo
def meta = loadmetaclass(commonscripts, metareporoot)
return meta
}
def String outputDescription(menuitems, releaseinfo) {
meta = releaseinfo.meta
for (publishableitem in meta.publishableinfo) {
menuitems.add("${meta.productinfo.productname} ${meta.productinfo.subcomponentname} ${publishableitem.filepath}")
}
}
def String outputSelection(menuitems, releaseinfo) {
meta = releaseinfo.meta
for (publishableitem in meta.publishableinfo) {
menuitems.add("${meta.productinfo.productname}#${meta.productinfo.subcomponentname}#${publishableitem.filepath}")
}
}
def List<String> getItems(meta) {
def List<String> menuitems = new ArrayList<String>()
def metaitems = meta.releasewalkerunique(metalevelsext)
log("metaitems is ${metaitems.getClass()}")
try {
for (key in metaitems.keySet()) {
def releaseinfo = metaitems[key]
if (outputselectext == "description") {
outputDescription(menuitems, releaseinfo)
}
if (outputselectext == "selection") {
outputSelection(menuitems, releaseinfo)
}
}
return menuitems
} catch (Exception e) {
menuitems.add("Error ${e}")
return menuitems
}
}
def meta = makeworking()
def items = getItems(meta)
count = 0
for (item in items) {
count += 1
log ("${count}: ${item}")
}
return items

127
publish/publishitems.groovy Normal file
View file

@ -0,0 +1,127 @@
import com.cwctravel.hudson.plugins.extended_choice_parameter.ExtendedChoiceParameterDefinition
class PublishableItemsSelection {
def script
def ArrayList<String> preselectedmenuitems
def ArrayList<String> menuitemdescriptions
def ArrayList<String> menuitemsfull
def ExtendedChoiceParameterDefinition multiselect
PublishableItemsSelection(script) {
this.script = script
preselectedmenuitems = new ArrayList<String>()
menuitemdescriptions = new ArrayList<String>()
menuitemsfull = new ArrayList<String>()
}
def init(
String name,
String description,
releasemeta,
String preselectedext,
String metalevelsstringext,
String visibleItemCountExt,
String controltype) {
outputSelectionfromPreselect(preselectedmenuitems, preselectedext)
def Integer metalevelsext = metalevelsstringext.toInteger()
def Integer visibleItemCount = visibleItemCountExt.toInteger()
def metaitems = releasemeta.releasewalkerunique(metalevelsext)
for (key in metaitems.keySet()) {
def releaseinfo = metaitems[key]
outputDescription(menuitemdescriptions, releaseinfo)
outputSelection(menuitemsfull, releaseinfo)
}
script.echo("name is: ${name}")
script.echo("description is: ${description}")
script.echo("menuitemsfull is: ${menuitemsfull}")
script.echo("preselectedmenuitems is: ${preselectedmenuitems}")
script.echo("menuitemdescriptions is: ${menuitemdescriptions}")
script.echo("visibleItemCount is: ${visibleItemCount}")
script.echo("controltype is: ${controltype}")
def seperator = ","
visibleItemCount = Math.min(visibleItemCount, menuitemsfull.size())
script.echo("visibleItemCount is now: ${visibleItemCount}")
multiselect = new ExtendedChoiceParameterDefinition(
name, // String name
controltype, // String type
menuitemsfull.join(seperator), // String value
"project name", // String projectName
"", // String propertyFile
"", // String groovyScript
"", // String groovyScriptFile
"", // String bindings
"", // String groovyClasspath
"", // String propertyKey
preselectedmenuitems.join(seperator),// String defaultValue
"", // String defaultPropertyFile
"", // String defaultGroovyScript
"", // String defaultGroovyScriptFile
"", // String defaultBindings
"", // String defaultGroovyClasspath
"", // String defaultPropertyKey
menuitemdescriptions.join(seperator),// String descriptionPropertyValue
"", // String descriptionPropertyFile
"", // String descriptionGroovyScript
"", // String descriptionGroovyScriptFile
"", // String descriptionBindings
"", // String descriptionGroovyClasspath
"", // String descriptionPropertyKey
"", // String javascriptFile
"", // String javascript
false, // boolean saveJSONParameterToFile
false, // boolean quoteValue
visibleItemCount, // int visibleItemCount
description, // String description
seperator) // String multiSelectDelimiter
}
def outputSelectionfromPreselect(menuitems, preselectedext) {
script.echo ("preselectext: ${preselectedext}")
def menuitemstemp = preselectedext.split(',')
script.echo ("Menuitemstemp: ${menuitemstemp}")
for (menuitem in menuitemstemp) {
menuitems.add(menuitem.trim())
}
}
def outputDescription(menuitems, releaseinfo) {
def meta = releaseinfo.meta
for (publishableitem in meta.publishableinfo) {
menuitems.add("${meta.productinfo.productname} ${meta.productinfo.subcomponentname} ${publishableitem.filepath}")
}
}
def outputSelection(menuitems, releaseinfo) {
def meta = releaseinfo.meta
for (publishableitem in meta.publishableinfo) {
menuitems.add("${meta.productinfo.productname}#${meta.productinfo.subcomponentname}#${publishableitem.filepath}")
}
}
def multiSelect() {
return multiselect
}
}
PublishableItemsSelection createItemSelector(
String name,
String description,
releasemeta,
String preselectedext,
String metalevelsstringext,
String visibleItemCountExt = '20',
String type = 'PT_CHECKBOX') { // Could also be "PT_MULTI_SELECT"
PublishableItemsSelection pis = new PublishableItemsSelection(this)
pis.init(name, description, releasemeta, preselectedext, metalevelsstringext, visibleItemCountExt, type)
return pis
}
return this;

View file

@ -2,32 +2,32 @@
import org.apache.commons.net.ftp.FTPClient
class FTPSiteInfo {
String url
String username
String password
String workingdirectory
FTPSiteInfo(String url, String username, String password, String workingdirectory) {
String url
String username
String password
String workingdirectory
FTPSiteInfo(String url, String username, String password, String workingdirectory) {
this.url = url
this.username = username
this.password = password
this.workingdirectory = workingdirectory
}
this.workingdirectory = workingdirectory
}
}
FTPSiteInfo createFTPSiteInfo(String url, String username, String password, String workingdirectory) {
FTPSiteInfo ftpsiteinfo = new FTPSiteInfo(url, username, password, workingdirectory)
return ftpsiteinfo
return ftpsiteinfo
}
FTPClient createFTPClient(FTPSiteInfo ftpsiteinfo) {
FTPClient ftpclient = new FTPClient().with {
connect ftpsiteinfo.url
enterLocalPassiveMode()
login ftpsiteinfo.username, ftpsiteinfo.password
changeWorkingDirectory ftpsiteinfo.workingdirectory
}
return ftpclient
FTPClient ftpclient = new FTPClient()
ftpclient.connect(ftpsiteinfo.url)
ftpclient.enterLocalPassiveMode()
ftpclient.login(ftpsiteinfo.username, ftpsiteinfo.password)
ftpclient.changeWorkingDirectory(ftpsiteinfo.workingdirectory)
return ftpclient
}
return this;

View file

@ -1,7 +1,7 @@
ftpremote = load("${autobuilder.commonscripts()}/remoteaccess/ftp.groovy")
FTPSiteInfo getHostedFTPSiteInfo() {
FTPSiteInfo hostedftpsiteinfo =
def getHostedFTPSiteInfo() {
hostedftpsiteinfo =
ftpremote.createFTPSiteInfo("ftp.hostedftp.com",
"ftp@globalinkjetsystems.com",
"ramshorn42",
@ -13,8 +13,8 @@ def getCustomerList() {
def List<String> customerfilenames = new ArrayList<String>()
def List<String> customers = new ArrayList<String>()
FTPSiteInfo ftpsiteinfo = getHostedFTPSiteInfo()
FTPClient ftpclient = ftpremote.createFTPClient(ftpsiteinfo)
def ftpsiteinfo = getHostedFTPSiteInfo()
def ftpclient = ftpremote.createFTPClient(ftpsiteinfo)
customerfilenames = ftpclient.listNames()
for(customer in customerfilenames) {

View file

@ -25,10 +25,13 @@ String getGitInfo(String workingSetRootPath) {
}
}
List<String> gettaglist(String workingSetRootPath) {
ArrayList<String> gettaglist(String workingSetRootPath) {
ArrayList<String> taglist = new ArrayList<String>()
dir(workingSetRootPath) {
return clh.getCommandOutput('git tag --sort=-version:refname')
def tagliststring = clh.getCommandOutput('git tag --sort=-version:refname')
taglist = tagliststring.split('\\n')
}
return taglist
}
@NonCPS