From f7ea682f6dd92a65ff4019a46b93e493eb5a4fdf Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 11 Sep 2019 23:30:06 +0100 Subject: [PATCH] HMBXR5601-827 - Had to reverse the changes of this commonly used script --- copy/logic.groovy | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/copy/logic.groovy b/copy/logic.groovy index a5b134b..3f3f48d 100644 --- a/copy/logic.groovy +++ b/copy/logic.groovy @@ -24,12 +24,10 @@ pipeline { stage('Copying logic artifacts') { steps { script { - env.SG600_LOGICDEST = "${WORKSPACE}/sg600_logic" - env.KTB_LOGICDEST = "${WORKSPACE}/ktb_logic" + env.LOGICDEST = "${WORKSPACE}/logic" if (LOGIC_ARTIFACT_LOCATION == "Jenkins job artifact") { importer = load("${autobuilder.commonscripts()}/import/importer.groovy") - importer.artifactimport(meta, KTB_LOGIC_ARTIFACT_PROJECT, KTB_LOGIC_ARTIFACT_BUILD_SELECTOR, KTB_LOGICDEST) - importer.artifactimport(meta, SG600_LOGIC_ARTIFACT_PROJECT, SG600_LOGIC_ARTIFACT_BUILD_SELECTOR, SG600_LOGICDEST) + importer.artifactimport(meta, LOGIC_ARTIFACT_PROJECT, LOGIC_ARTIFACT_BUILD_SELECTOR, LOGICDEST) } } } @@ -39,7 +37,7 @@ pipeline { script { def artifactlist = meta.generateartifacts(["embedded_logic/**"]) sh """ - rm -v -rf diff meta embedded_logic + rm -v -rf meta mv -v logic/* . """ archiveArtifacts "${artifactlist}" @@ -61,4 +59,4 @@ pipeline { echo 'Succeeded build' } } -} +} \ No newline at end of file