From 308e96877e2a342ecb2a15202ed2d6066c4cff23 Mon Sep 17 00:00:00 2001 From: saadrahim <44449863+saadrahim@users.noreply.github.com> Date: Wed, 29 Apr 2020 16:24:21 -0600 Subject: [PATCH] Refactoring packaging (#193) --- .jenkins/common.groovy | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.jenkins/common.groovy b/.jenkins/common.groovy index 76a6e22607..4786571e66 100644 --- a/.jenkins/common.groovy +++ b/.jenkins/common.groovy @@ -31,15 +31,10 @@ def runTestCommand (platform, project) def runPackageCommand(platform, project, jobName) { - def command = """ - set -x - cd ${project.paths.project_build_prefix}/build/release - make package - rm -rf package && mkdir -p package - mv *.deb package/ - """ - platform.runCommand(this,command) - platform.archiveArtifacts(this, """${project.paths.project_build_prefix}/build/release/package/*.deb""") + def packageHelper = platform.makePackage(platform.jenkinsLabel,"${project.paths.project_build_prefix}/build/release") + + platform.runCommand(this, packageHelper[0]) + platform.archiveArtifacts(this, packageHelper[1]) } return this