HMBXR5601-827 - Had to reverse the changes of this commonly used script

This commit is contained in:
Dan Hawkins 2019-09-11 23:30:06 +01:00
commit f7ea682f6d

View file

@ -24,12 +24,10 @@ pipeline {
stage('Copying logic artifacts') { stage('Copying logic artifacts') {
steps { steps {
script { script {
env.SG600_LOGICDEST = "${WORKSPACE}/sg600_logic" env.LOGICDEST = "${WORKSPACE}/logic"
env.KTB_LOGICDEST = "${WORKSPACE}/ktb_logic"
if (LOGIC_ARTIFACT_LOCATION == "Jenkins job artifact") { if (LOGIC_ARTIFACT_LOCATION == "Jenkins job artifact") {
importer = load("${autobuilder.commonscripts()}/import/importer.groovy") importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
importer.artifactimport(meta, KTB_LOGIC_ARTIFACT_PROJECT, KTB_LOGIC_ARTIFACT_BUILD_SELECTOR, KTB_LOGICDEST) importer.artifactimport(meta, LOGIC_ARTIFACT_PROJECT, LOGIC_ARTIFACT_BUILD_SELECTOR, LOGICDEST)
importer.artifactimport(meta, SG600_LOGIC_ARTIFACT_PROJECT, SG600_LOGIC_ARTIFACT_BUILD_SELECTOR, SG600_LOGICDEST)
} }
} }
} }
@ -39,7 +37,7 @@ pipeline {
script { script {
def artifactlist = meta.generateartifacts(["embedded_logic/**"]) def artifactlist = meta.generateartifacts(["embedded_logic/**"])
sh """ sh """
rm -v -rf diff meta embedded_logic rm -v -rf meta
mv -v logic/* . mv -v logic/* .
""" """
archiveArtifacts "${artifactlist}" archiveArtifacts "${artifactlist}"