diff --git a/Jenkinsfile b/Jenkinsfile index e8091c7..b11ca00 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,23 +24,21 @@ node(label: 'raspberrypi') { sh "rm -fr ${results}" sh "mkdir -p ${results}" dir(pkgdir) { - sh "DIST=${dist} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${results}" + sh "DIST=${dist} BRANCH=${env.BRANCH_NAME} pdebuild --use-pdebuild-internal --debbuildopts -b --buildresult ${WORKSPACE}/${results} -- --override-config" } archiveArtifacts artifacts: "${results}/*.deb", fingerprint: true } stage("Test install on ${dist}") { - sh "/build/repo/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.deb" + sh "/build/pi-builder/scripts/validate-packages.sh ${dist} ${results}/dump1090-fa_*.deb ${results}/dump1090_*.deb" } } - if (env.BRANCH_NAME == "master" || env.BRANCH_NAME == "dev") { - stage("Deploy to staging repo") { - for (int i = 0; i < dists.size(); ++i) { - def dist = dists[i] - def results = "results-${dist}" - sh "/build/repo/deploy-packages.sh ${dist} ${results}/*.deb" - } + stage('Deploy to internal repository') { + for (int i = 0; i < dists.size(); ++i) { + def dist = dists[i] + def results = "results-${dist}" + sh "/build/pi-builder/scripts/deploy.sh -distribution ${dist} -branch ${env.BRANCH_NAME} ${results}/*.deb" } } }