From fb559434b6f8af77e73e318e000c7c4a2308080b Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Fri, 19 Jun 2020 16:24:32 -0700 Subject: [PATCH] jenkins builds rpms --- Jenkinsfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 363919d82..f7070fe48 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -443,15 +443,17 @@ def buildCentosNative() { runtime.inside { dir("build") { if (distro == 'centos7' && arch == 'amd64') { - sh 'source scl_source enable devtoolset-8 llvm-toolset-7 && make' + sh 'source scl_source enable devtoolset-8 llvm-toolset-7 && CMAKE_ARGS="-DZT_PACKAGE_FORMAT=RPM" make setup' } else { - sh 'make' + sh 'CMAKE_ARGS="-DZT_PACKAGE_FORMAT=RPM" make setup' + } + dir ("build") { + sh 'make package -j4' } - // sh 'make redhat' - // sh "mkdir -p ${distro}" - // sh "cp -av `find ~/rpmbuild/ -type f -name \"*.rpm\"` ${distro}/" - // archiveArtifacts artifacts: "${distro}/*.rpm", onlyIfSuccessful: true } + sh "mkdir -p ${distro}" + sh "cp -av build/build/*.rpm` ${distro}/" + archiveArtifacts artifacts: "${distro}/*.rpm", onlyIfSuccessful: true cleanWs deleteDirs: true, disableDeferredWipeout: true, notFailBuild: true }