Fixing jenkins file relative paths
Change-Id: I1a7574606b8cb73576727924ca9695b9912410cf
(cherry picked from commit fcbc54bacd0c86eebdfd19ac90c48f779048b7a5)
diff --git a/Jenkinsfile.newBuildSystem b/Jenkinsfile.newBuildSystem
index 872d607..ee26974 100644
--- a/Jenkinsfile.newBuildSystem
+++ b/Jenkinsfile.newBuildSystem
@@ -40,8 +40,8 @@
checkout changelog: false, poll: false, scm: [$class: 'RepoScm', currentBranch: true, manifestBranch: params.branch, manifestRepositoryUrl: "${manifestUrl}", quiet: true]
}
- dir('build') {
- try {
+ try {
+ dir('build') {
stage ("Re-deploy head node") {
maasOps: {
sh "maas login maas http://${config.maas.ip}/MAAS/api/2.0 ${config.maas.api_key}"
@@ -212,24 +212,24 @@
}
}
}
-
- if (config.make_release == true) {
- stage ("Trigger Build") {
- url = 'https://jenkins.opencord.org/job/release-build/job/' + params.branch + '/build'
- httpRequest authentication: 'auto-release', httpMode: 'POST', url: url, validResponseCodes: '201'
- }
- }
-
- currentBuild.result = 'SUCCESS'
- } catch (err) {
- currentBuild.result = 'FAILURE'
- step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
- } finally {
- sh "make -C build clean-all || true"
- sh "rm -rf *"
}
- echo "RESULT: ${currentBuild.result}"
- }
+
+ if (config.make_release == true) {
+ stage ("Trigger Build") {
+ url = 'https://jenkins.opencord.org/job/release-build/job/' + params.branch + '/build'
+ httpRequest authentication: 'auto-release', httpMode: 'POST', url: url, validResponseCodes: '201'
+ }
+ }
+
+ currentBuild.result = 'SUCCESS'
+ } catch (err) {
+ currentBuild.result = 'FAILURE'
+ step([$class: 'Mailer', notifyEveryUnstableBuild: true, recipients: "${notificationEmail}", sendToIndividuals: false])
+ } finally {
+ sh "make -C build clean-all || true"
+ sh "rm -rf *"
+ }
+ echo "RESULT: ${currentBuild.result}"
}
}