Fixing Jenkinsfile for CORD 3.0
Change-Id: I1ffbb62e9ef52b42724e84f618395f6a53e4fb9a
diff --git a/Jenkinsfile b/Jenkinsfile
index 3d5a0c4..6490d8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,8 +23,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 and Build Vagrant box") {
parallel(
maasOps: {
@@ -194,24 +194,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 'vagrant destroy -f corddev'
- sh 'rm -rf config/pod-configs'
}
- 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 'cd build && vagrant destroy -f corddev'
+ sh 'rm -rf *'
+ }
+
+ echo "RESULT: ${currentBuild.result}"
}
}