Correct importing

This commit is contained in:
Dan Hawkins 2022-03-28 11:14:41 +01:00
commit 00cd7a78a8

View file

@ -325,13 +325,10 @@ def artifactimport(meta,
def findresults = parentmeta.findAssociatedMeta(parentmetapath, childproduct, childsubcomponent)
if (findresults.matchfound) {
childmeta = findresults.matchedmetaitem.metainfo
echo "Child meta indicates it is released: ${childmeta.releaseinfo.released}"
echo "Parent meta indicates it is released: ${parentmeta.releaseinfo.released}"
if (importoptions.m_sourceselect == 'Release repository' || childmeta.releaseinfo.released) {
echo "Importing from release repo"
if (importoptions.m_sourceselect == 'Release repository' || parentmeta.releaseinfo.released) {
importoptions.releaserepo(childmeta.releaseinfo.releaserepoURL, childmeta.releasetag())
} else {
echo "Importing from jenkins job"
importoptions.jenkinsjob(childmeta.jenkinsbuildinfo.buildjobname, childmeta.jenkinsbuildinfo.buildnumber)
}
childmeta2 = importer.artifactimport(meta, importoptions, destinationfolder)