Handle components that have no source repo
This commit is contained in:
parent
e40949419a
commit
85d7f751da
1 changed files with 34 additions and 23 deletions
|
|
@ -99,27 +99,32 @@ def showmetaitems(metaitems) {
|
|||
echo info
|
||||
}
|
||||
|
||||
def checkoutsourcerepo(buildmeta, String checkoutfolder) {
|
||||
def boolean checkoutsourcerepo(buildmeta, String checkoutfolder) {
|
||||
boolean checkedout = false
|
||||
def String sourcerepo = buildmeta.gitinfo.remoteurl
|
||||
echo "Updating source repo: ${sourcerepo} in folder: ${checkoutfolder}"
|
||||
if (sourcerepo) {
|
||||
// Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component
|
||||
if (fileExists(checkoutfolder)) {
|
||||
dir(checkoutfolder) {
|
||||
sh("""
|
||||
git reset --hard
|
||||
git clean -fdx
|
||||
git pull
|
||||
"""
|
||||
)
|
||||
if (sourcerepo?.trim()) {
|
||||
echo "Updating source repo: ${sourcerepo} in folder: ${checkoutfolder}"
|
||||
if (sourcerepo) {
|
||||
// Get the latest revision of the source repo without checking out working copy; Check out to a folder unique to component
|
||||
if (fileExists(checkoutfolder)) {
|
||||
dir(checkoutfolder) {
|
||||
sh("""
|
||||
git reset --hard
|
||||
git clean -fdx
|
||||
git pull
|
||||
"""
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
dir(sourcerepofolder) {
|
||||
sh("git clone ${sourcerepo} ${checkoutfolder}")
|
||||
else {
|
||||
dir(sourcerepofolder) {
|
||||
sh("git clone ${sourcerepo} ${checkoutfolder}")
|
||||
}
|
||||
}
|
||||
}
|
||||
checkedout = true
|
||||
}
|
||||
return checkedout
|
||||
}
|
||||
|
||||
def String getcomponent(meta) {
|
||||
|
|
@ -127,10 +132,9 @@ def String getcomponent(meta) {
|
|||
def String uniquefoldertemp = "${tempfolder}/${uniquefolder}"
|
||||
def String uniquefolderforsourcerepo = "${sourcerepofolder}/${uniquefolder}"
|
||||
|
||||
echo "Cloning/updating source repo in folder: ${uniquefolderforsourcerepo}"
|
||||
checkoutsourcerepo(meta, uniquefolderforsourcerepo)
|
||||
bool checkedout = checkoutsourcerepo(meta, uniquefolderforsourcerepo)
|
||||
|
||||
return uniquefolderforsourcerepo
|
||||
return [checkedout, uniquefolderforsourcerepo]
|
||||
}
|
||||
|
||||
def getgitlogdifferences(String gitrootfolder, String earlyrevision, String laterrevision, boolean tripledot = false) {
|
||||
|
|
@ -665,12 +669,19 @@ def compare(earlymetaitems, latermetaitems, key) {
|
|||
|
||||
summaryappend("${earlymeta.productinfo.productname} ${earlymeta.productinfo.subcomponentname}: Changed: ")
|
||||
|
||||
def uniquefolderforsourcerepo = getcomponent(earlymeta)
|
||||
def boolean repoavailable
|
||||
def String uniquefolderforsourcerepo
|
||||
(repoavailable, uniquefolderforsourcerepo) = getcomponent(earlymeta)
|
||||
|
||||
(result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
|
||||
List differencerecords = []
|
||||
if (repoavailable) {
|
||||
(result, differencerecords) = getdifferencerecords(earlymeta, latermeta, uniquefolderforsourcerepo)
|
||||
|
||||
summaryappend(" Items: ${differencerecords.size()} ")
|
||||
report(earlymeta, differencerecords)
|
||||
summaryappend(" Items: ${differencerecords.size()} ")
|
||||
report(earlymeta, differencerecords)
|
||||
} else {
|
||||
summaryappend(" No source repo ")
|
||||
}
|
||||
summaryappend("\n")
|
||||
|
||||
return [result, differencerecords];
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue