Merge commit 'd89eea94465888f66561a7a896db0d5aab86bc1d'

This commit is contained in:
Dan Hawkins 2019-12-19 16:19:18 +00:00
commit 9906cb119e
16 changed files with 193 additions and 91 deletions

View file

@ -40,7 +40,7 @@ def doCheck(checkpathlist, build_variant = "") {
// Print out dependencies of the built file
echo "Showing dependencies of ${srcFileExpanded}"
result = sh( script: """
readelf -d "${srcFileExpanded}" | grep NEEDED
readelf -d "${srcFileExpanded}"
if [ \$? -ne 0 ]; then exit 1; fi
""",
returnStatus: true
@ -156,7 +156,7 @@ def doBuildAndExportProject(String ds5folder, String toolchainfolder, String ds5
doDisplayLeftovers()
doRegisterToolchain(ds5folder, toolchainfolder)
echo "Build command: ${ds5shellcommand} \'${buildcommand} -no-indexer -build \"${project}/${build_variant}\"\'"
timeout(time: 10, unit: 'MINUTES') {
timeout(time: 20, unit: 'MINUTES') {
if (isUnix()) {
sh """
echo Start time: `date`

View file

@ -5,7 +5,7 @@ def registerConfigurationInfo(meta, String configurationName, String configurati
}
def registerPipelineScriptConfiguration(meta) {
registerConfigurationInfo(meta, 'pipeline script', '-', '-', gh.getGitInfo("${autobuilder.getautobuildpath()}"))
registerConfigurationInfo(meta, 'pipeline script', '-', '-', gh.getGitInfo(autobuilder.getautobuildpath()))
}
def gitCheckoutAndRegister(meta, String tool, String gitURL, String revision, String targetDir, String repoRoot = "", int cloneDepth = 1, boolean shallowClone = true, String filter = '') {

63
copy/esw.groovy Normal file
View file

@ -0,0 +1,63 @@
pipeline {
agent { label "${AGENT_LABEL}" }
stages {
stage('Initial setup') {
steps {
script {
meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startnonbuild(this)
importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
}
}
}
stage('Clean exports') {
steps {
script {
env.ESW = 'esw'
env.ESWDEST = "${WORKSPACE}/${ESW}"
env.ESWEXPORT = 'embedded_software'
cleanfolders = [
ESWDEST,
ESWEXPORT,
]
cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy")
cleaner.clean(cleanfolders)
}
}
}
stage('Copying embedded software artifacts') {
steps {
script {
importer.artifactimport(meta, ESW_ARTIFACT_LOCATION, ESW_ARTIFACT_BUILD_JOB, ESW_ARTIFACT_BUILD_SELECTOR, ESW_ARTIFACT_RELEASE_REPO, ESW_ARTIFACT_RELEASE_REVISION, ESWDEST)
}
}
}
stage('Archiving artifacts') {
steps {
script {
def artifactlist = meta.generateartifacts(["${ESWEXPORT}/**"])
sh """
rm -v -rf diff
rm -v -rf meta
mv -v "${ESW}"/* .
"""
archiveArtifacts "${artifactlist}"
}
}
}
}
post {
always {
echo 'Post-build'
}
failure {
echo 'Failed build'
}
unstable {
echo 'Unstable build'
}
success {
echo 'Succeeded build'
}
}
}

View file

@ -5,16 +5,18 @@ pipeline {
steps {
script {
meta = load("${WORKSPACE}/autobuild/Common_scripts/autobuilder.groovy").startnonbuild(this)
importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
}
}
}
stage('Clean exports') {
steps {
script {
env.LOGICDEST = "${WORKSPACE}/logic"
cleanfolders = [
"${WORKSPACE}/logic",
LOGICDEST,
"${WORKSPACE}/embedded_logic",
"${WORKSPACE}/diff", // Some old artifacts have this folder
]
cleaner = load("${autobuilder.commonscripts()}/clean/clean.groovy")
cleaner.clean(cleanfolders)
@ -24,11 +26,7 @@ pipeline {
stage('Copying logic artifacts') {
steps {
script {
env.LOGICDEST = "${WORKSPACE}/logic"
if (LOGIC_ARTIFACT_LOCATION == "Jenkins job artifact") {
importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
importer.artifactimport(meta, LOGIC_ARTIFACT_PROJECT, LOGIC_ARTIFACT_BUILD_SELECTOR, LOGICDEST)
}
importer.artifactimport(meta, LOGIC_ARTIFACT_LOCATION, LOGIC_ARTIFACT_PROJECT, LOGIC_ARTIFACT_BUILD_SELECTOR, LOGIC_RELEASE_REPO, LOGIC_RELEASE_REVISION, LOGICDEST)
}
}
}
@ -37,7 +35,6 @@ pipeline {
script {
def artifactlist = meta.generateartifacts(["embedded_logic/**"])
sh """
rm -v -rf diff
rm -v -rf meta
mv -v "logic"/* .
"""

View file

@ -1,18 +0,0 @@
def differences(meta, String sourcerevision, String previoussourcerevision, String sourcepath) {
def String cs = autobuilder.commonscripts()
def String difffile = meta.difffilepath()
def String jirakey = meta.productinfo.jirakey
if (isUnix()) {
sh """
"${PYTHON}" -u "${cs}/differences/show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -f "${difffile}"
"""
}
else {
bat """
"${PYTHON}" -u "${cs}\\differences\\show_release_differences.py" -g "${sourcepath}" -s "${sourcerevision}" -p "${previoussourcerevision}" -j "${jirakey}" -o "opposite notcommon" -f "${difffile}"
"""
}
}
return this;

View file

@ -405,9 +405,9 @@ class MergeReportRecord {
}
}
def mergereport(String reportsubfolder, LinkedHashMap<String, MergeReportRecord> merges, boolean iscomponent = true) {
def mergereport(String reportsubfolder, String title, LinkedHashMap<String, MergeReportRecord> merges, boolean iscomponent = true) {
dir(reportsubfolder) {
def String mergelist = "Merge list:\n"
def String mergelist = "${title}\nMerge list:\n"
def mergessorted = merges.sort()
for (amerge in mergessorted) {
def MergeReportRecord m = amerge.value
@ -439,9 +439,9 @@ class RevertsReportRecord {
}
}
def revertsreport(String reportsubfolder, LinkedHashMap<String, RevertsReportRecord> reverts, boolean iscomponent = true) {
def revertsreport(String reportsubfolder, String title, LinkedHashMap<String, RevertsReportRecord> reverts, boolean iscomponent = true) {
dir(reportsubfolder) {
def String revertlist = "Revert list:\n"
def String revertlist = "${title}\nRevert list:\n"
def revertssorted = reverts.sort()
for (arevert in revertssorted) {
def RevertsReportRecord r = arevert.value
@ -470,9 +470,9 @@ class TicketedReportRecord {
}
}
def ticketedreport(String reportsubfolder, LinkedHashMap<String, TicketedReportRecord> ticketed, boolean iscomponent = true) {
def ticketedreport(String reportsubfolder, String title, LinkedHashMap<String, TicketedReportRecord> ticketed, boolean iscomponent = true) {
dir(reportsubfolder) {
def String ticketedlist = "Ticketed list:\n"
def String ticketedlist = "${title}\nTicketed list:\n"
def ticketedsorted = ticketed.sort()
for (aticketed in ticketedsorted) {
def TicketedReportRecord r = aticketed.value
@ -499,9 +499,9 @@ class UnticketedReportRecord {
}
}
def unticketedreport(String reportsubfolder, LinkedHashMap<String, UnticketedReportRecord> unticketed, boolean iscomponent = true) {
def unticketedreport(String reportsubfolder, String title, LinkedHashMap<String, UnticketedReportRecord> unticketed, boolean iscomponent = true) {
dir(reportsubfolder) {
def String unticketedlist = "Unticketed list:\n"
def String unticketedlist = "${title}\nUnticketed list:\n"
def unticketedsorted = unticketed.sort()
for (anunticketed in unticketedsorted) {
UnticketedReportRecord u = anunticketed.value
@ -523,9 +523,9 @@ class TicketsReportRecord {
}
}
def ticketsreport(String reportsubfolder, tickets, boolean iscomponent = true) {
def ticketsreport(String reportsubfolder, String title, tickets, boolean iscomponent = true) {
dir(reportsubfolder) {
String ticketlist = "Ticket list:\n"
String ticketlist = "${title}\nTicket list:\n"
ticketssorted = tickets.sort()
for (ticketnumber in ticketssorted) {
TicketsReportRecord t = ticketnumber.value
@ -535,9 +535,9 @@ def ticketsreport(String reportsubfolder, tickets, boolean iscomponent = true) {
}
}
def differencerecordsreport(String reportsubfolder, differencerecords, boolean iscomponent = true) {
def differencerecordsreport(String reportsubfolder, String title, differencerecords, boolean iscomponent = true) {
dir(reportsubfolder) {
String recordlist = ""
String recordlist = "${title}\n"
for (dr in differencerecords) {
recordlist += dr.dump() + "\n\n"
}
@ -545,7 +545,7 @@ def differencerecordsreport(String reportsubfolder, differencerecords, boolean i
}
}
def boolean report(meta, differencerecords, boolean iscomponent = true) {
def boolean report(meta, title, differencerecords, boolean iscomponent = true) {
def Map ticketed = [:]
def Map merges = [:]
def Map reverts = [:]
@ -664,12 +664,24 @@ def boolean report(meta, differencerecords, boolean iscomponent = true) {
} else {
reportsubfolder = "${reportfolder}/Combined"
}
mergereport(reportsubfolder, merges, iscomponent)
revertsreport(reportsubfolder, reverts, iscomponent)
ticketedreport(reportsubfolder, ticketed, iscomponent)
unticketedreport(reportsubfolder, unticketed, iscomponent)
ticketsreport(reportsubfolder, tickets, iscomponent)
differencerecordsreport(reportsubfolder, differencerecords, iscomponent)
mergereport(reportsubfolder, title, merges, iscomponent)
revertsreport(reportsubfolder, title, reverts, iscomponent)
ticketedreport(reportsubfolder, title, ticketed, iscomponent)
unticketedreport(reportsubfolder, title, unticketed, iscomponent)
ticketsreport(reportsubfolder, title, tickets, iscomponent)
differencerecordsreport(reportsubfolder, title, differencerecords, iscomponent)
}
def title(earlymeta, latermeta) {
return """
Differences in:
Product: ${earlymeta.productinfo.productname} Subcomponent: ${earlymeta.productinfo.subcomponentname}
between:
then:
Build date: ${earlymeta.jenkinsbuildinfo.builddate} Build stamp: ${earlymeta.buildstampinfo.buildstamp} Git revision: ${earlymeta.gitinfo.gitrevision}
now:
Build date: ${latermeta.jenkinsbuildinfo.builddate} Build stamp: ${latermeta.buildstampinfo.buildstamp} Git revision: ${latermeta.gitinfo.gitrevision}
"""
}
def compare(earlymetaitems, latermetaitems, key) {
@ -690,7 +702,7 @@ def compare(earlymetaitems, latermetaitems, key) {
(result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
summaryappend(" Items: ${differencerecords.size()} ")
report(earlymeta, differencerecords)
report(earlymeta, title(earlymeta, latermeta), differencerecords)
} else {
summaryappend(" No source repo ")
}
@ -737,7 +749,7 @@ def comparehierarchy(meta, String earlymetafolder, String latermetafolder, Strin
summaryappend("\n")
}
}
report(meta, differencerecords, false)
report(meta, title(earlymeta, latermeta), differencerecords, false)
return [summarystring, markunstable, unstablereason]
}

View file

@ -51,7 +51,7 @@ def hierarchyartifactimportfromrepo(meta, String repo, String revision, String d
def ArrayList<String> sparseitemlist = gh.convertSparseItemsString(filter)
gh.gitCheckoutAlt(rooturl, rootrevision, destpath, "", 1, true, sparseitemlist)
def importedmeta = meta.importrelated(destpath)
def importedmeta = meta.importrelated(destpath, rooturl, rootrevision, gh.getGitInfo(destpath))
relatedimportinfo = importedmeta.getassociated()
echo "Cloning associated repos"
@ -85,16 +85,16 @@ def hierarchyartifactimportfromrepo(meta, String repo, String revision, String d
def artifactimportfromrepo(meta, String repo, String revision, String destpath, boolean incrementversionnumber = true, String filter = '', String excludes = '', boolean fingerprint = false) {
def rooturl = repo.trim()
def rootrevision = revision.trim()
echo "Cloning root release repo: ${rooturl}, revision: ${rootrevision} at folder: ${destpath}"
echo "Cloning release repo: ${rooturl}, revision: ${rootrevision} at folder: ${destpath}"
def ArrayList<String> sparseitemlist = gh.convertSparseItemsString(filter)
gh.gitCheckoutAlt(rooturl, rootrevision, destpath, "", 1, true, sparseitemlist)
def importedmeta = meta.importrelated(destpath)
def importedmeta = meta.importrelated(destpath, rooturl, rootrevision, gh.getGitInfo(destpath))
gh.stripgithistory(destpath)
def metafilepath = "${destpath}/${meta.metafilepath()}"
echo "Marking root meta as released and rewriting meta file: ${metafilepath}"
echo "Marking meta as released and rewriting meta file: ${metafilepath}"
rewritemetafileasreleased(importedmeta, metafilepath)
if (incrementversionnumber) {
@ -106,6 +106,7 @@ def artifactimportfromrepo(meta, String repo, String revision, String destpath,
def artifactimport(meta, String source, String jenkinsjob, buildnumberorselector, String repo, String revision, String destpath, boolean incrementversionnumber = true, String filter = '', String excludes = '', boolean fingerprint = false, boolean nested = false) {
switch (source) {
case "Jenkins job artifact":
case "Jenkins job artefact":
return artifactimport(meta, jenkinsjob, buildnumberorselector, destpath, incrementversionnumber, filter, excludes, fingerprint)
case "Release repository":
if (nested) {

View file

@ -429,11 +429,8 @@ class PublishableInfo extends GISJsonSerialised {
class MetaInfo extends GISJsonSerialised {
private static String FORMAT = "0.1"
private static String METAFOLDERNAME = "meta"
private static String DIFFFOLDERNAME = "diff"
private static String METAFILENAME = "info.json"
private static String METADIFFFILENAME = "differences.txt"
private static String METAARTIFACTS = "${METAFOLDERNAME}/**"
private static String DIFFARTIFACTS = "${DIFFFOLDERNAME}/**"
class RelatedMetaInfo extends GISJsonSerialised {
String offsetpath
@ -514,6 +511,7 @@ class MetaInfo extends GISJsonSerialised {
void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) {
def ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA)
script.echo("Adding configuration info: name: ${configurationname} url: ${configurationURL} version: ${configurationversion} sha: ${configurationSHA}")
configurationinfo.add(ci)
}
@ -607,11 +605,7 @@ class MetaInfo extends GISJsonSerialised {
return METAFOLDERNAME + "/" + METAFILENAME
}
static String difffilepath() {
return DIFFFOLDERNAME + "/" + METADIFFFILENAME
}
MetaInfo importrelated(String destpath) {
MetaInfo importrelated(String destpath, String givenRepo = 'Unknown', String givenRevision = 'Unknown', String givenSHA = 'Unknown') {
MetaInfo mi = new MetaInfo(script)
def String adjustedpath = relativize(destpath)
@ -620,22 +614,12 @@ class MetaInfo extends GISJsonSerialised {
mi.deserialiseJson(importedmetafile)
} else {
script.echo("Could not deserialise meta at file: ${importedmetafile} (destpath: ${destpath})- Does not exist")
mi.addConfigurationInfo('', givenRepo, givenRevision, givenSHA)
}
RelatedMetaInfo rmi = new RelatedMetaInfo(script, adjustedpath, mi)
associatedmeta.add(rmi)
def importedmetadifffile = adjustedpath + "/" + difffilepath()
if (script.fileExists(importedmetadifffile)) {
def String newcontents = script.readFile(file: importedmetadifffile)
def String currentcontents = ""
if (script.fileExists(difffilepath())) {
currentcontents = script.readFile(file: difffilepath())
}
script.writeFile(file: difffilepath(), text: currentcontents + "\n" + mi.productinfo.productname + " " + mi.productinfo.subcomponentname + ":\n" + newcontents)
}
return mi
}
@ -660,15 +644,11 @@ class MetaInfo extends GISJsonSerialised {
return METAFOLDERNAME
}
static String difffolder() {
return DIFFFOLDERNAME
}
String generateartifacts(ArrayList<String> releasedfromhere = new ArrayList<String>(), // These items are recorded in meta as released from here
ArrayList<String> releasedfromsubmeta = new ArrayList<String>(), // These items are not recorded in meta as released from here
String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}"
) {
def String artifactlist = "${METAARTIFACTS},${DIFFARTIFACTS}"
def String artifactlist = METAARTIFACTS
releaseinfo.addReleaseItem(METAARTIFACTS)
for (releaseitem in releasedfromhere) {
artifactlist += "," + releaseitem
@ -777,10 +757,6 @@ MetaInfo metareset(script) {
deleteDir()
}
dir(mi.difffolder()) {
deleteDir()
}
return mi
}

View file

@ -64,7 +64,7 @@ def buildPackage(String packageout, String uniquepackageout, DebRootDefinition p
try {
sh """#!/bin/bash
# Exit if any command fails
set -e
set -xe
echo "${password}" | sudo -S echo

View file

@ -53,7 +53,26 @@ pipeline {
steps {
script {
gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
def releases = gh.gettaglist(SOURCEDIR)
def allreleases = gh.gettaglist(SOURCEDIR)
def releases = new ArrayList<String>()
if (FILTER_REDUNDANT_RELEASES == 'false') {
echo("Showing all releases")
releases = allreleases
} else {
echo("Showing filtered releases")
for (release in allreleases) {
if (!release.toLowerCase().startsWith("superceded") &&
!release.toLowerCase().startsWith("erroneous") &&
!release.toLowerCase().startsWith("faulty") &&
!release.toLowerCase().startsWith("ignore") &&
!release.toLowerCase().startsWith("inmainline")) {
//echo("Showing release: ${release}")
releases.add(release)
} else {
//echo("Not showing release: ${release}")
}
}
}
timeout(time: 10, unit: 'MINUTES') {
release = input(
message: 'Please select the software version',

View file

@ -124,4 +124,4 @@ PublishableItemsSelection createItemSelector(
return pis
}
return this;
return this;

View file

@ -262,6 +262,7 @@ def sourcegittags(String buildsha, List taglist) {
}
def releasegitpush(String dryrunpush ) {
sh("git remote -v")
if (dryrunpush == "true") {
sh("git push -n --tags origin master")
summaryappend(",Dry-Run-Push")
@ -274,6 +275,7 @@ def releasegitpush(String dryrunpush ) {
}
def sourcegitpush(String dryrunpush ) {
sh("git remote -v")
if (dryrunpush == "true") {
sh("git push -n --tags")
summaryappend(",Src-Dry-Run-Push")

View file

@ -63,9 +63,18 @@ pipeline {
script {
def CCMOLDER = "${STATICANALYSIS}/ccm"
dir(CCMOLDER) {
bat """
"${CCM}" "${SRC}" /xml /nummetrics=100 > ccm.xml
"""
echo "Executing: ${CCM} ${SRC} /xml /nummetrics=100 > ccm.xml"
if (isUnix()) {
sh """#!/bin/bash
find "${SRC}" -type f ! -name "*.cpp" -a ! -name "*.h" -a ! -name "*.hpp" -a ! -name "*.c" -exec rm -r {} \;
# Uses mono
"${CCM}" "${SRC}" /xml /nummetrics=100 > ccm.xml
"""
} else {
bat """
"${CCM}" "${SRC}" /xml /nummetrics=100 > ccm.xml
"""
}
}
recordIssues(tools: [
ccm(pattern: "**/ccm.xml", reportEncoding: 'UTF-8'),

View file

@ -57,9 +57,18 @@ pipeline {
script {
def CPPCHECKFOLDER = "${STATICANALYSIS}/cppcheck"
dir(CPPCHECKFOLDER) {
bat """
"${CPPCHECK}" --xml --xml-version=2 "${SRC}" 2> cppcheck.xml
"""
echo "Executing: ${CPPCHECK} --xml --xml-version=2 ${SRC} 2> cppcheck.xml"
if (isUnix()) {
sh """#!/bin/bash
set -e
"${CPPCHECK}" --xml --xml-version=2 "${SRC}" 2> cppcheck.xml
"""
} else {
bat """
"${CPPCHECK}" --xml --xml-version=2 "${SRC}" 2> cppcheck.xml
"""
}
}
recordIssues(tools: [
cppCheck(pattern: "**/cppcheck.xml", reportEncoding: 'UTF-8'),

View file

@ -0,0 +1,25 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Workload.NativeDesktop",
"Microsoft.VisualStudio.Workload.NetWeb",
"Microsoft.VisualStudio.Workload.NetCoreTools",
"microsoft.net.componentgroup.targetingpacks.common",
"microsoft.componentgroup.blend",
"microsoft.visualstudio.component.entityframework",
"microsoft.visualstudio.component.debugger.justintime",
"microsoft.visualstudio.component.wcf.tooling",
"microsoft.visualstudio.component.vc.diagnostictools",
"microsoft.visualstudio.component.vc.cmake.project",
"microsoft.visualstudio.component.vc.testadapterforboosttest",
"microsoft.visualstudio.component.vc.testadapterforgoogletest",
"microsoft.visualstudio.component.vc.atlmfc",
"microsoft.visualstudio.component.appinsights.tools",
"microsoft.visualstudio.component.diagnostictools",
"microsoft.visualstudio.componentgroup.web.cloudtools",
"microsoft.visualstudio.component.aspnet45",
"microsoft.visualstudio.component.webdeploy",
"microsoft.visualstudio.component.nuget.buildtools"
]
}

View file

@ -159,4 +159,11 @@ String generate(meta, String sourcerevision, String sourcepath, String basebuild
return generate(meta, sourcerevision, sourcepath, bbn)
}
String copyfrom(meta, othermeta) {
meta.gitinfo = othermeta.gitinfo
meta.buildstampinfo = othermeta.buildstampinfo
return meta.buildstampinfo.buildstamp
}
return this;