From ba8f8a2813d9fc479e337de71a41b13337992162 Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Wed, 11 Jul 2018 14:09:19 -0600
Subject: [PATCH] CI: Update cleanup steps and permissions
Change-Id: I7ca92935979d94845af8e1caf4468cbd6209b7de
---
tests/CI/gates.jenkinsfile | 2 ++
tests/CI/unittests.jenkinsfile | 20 +++++++++++---------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 40c7916b39..6f489a7894 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -60,6 +60,8 @@ pipeline {
/* Here's where we switch to scripted pipeline */
script {
stage ("Checkout") {
+ sh "sudo chown -R jenkins:users ."
+
/*
* Jenkins has already automatically checked out the base branch
* for this change but we now need to check out the change itself
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 0925910368..7486823e70 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -65,6 +65,7 @@ pipeline {
steps {
script {
stage ("Checkout") {
+ sh "sudo chown -R jenkins:users ."
/*
* Jenkins has already automatically checked out the base branch
* for this change but we now need to check out the change itself
@@ -75,6 +76,7 @@ pipeline {
* The Gerrit Trigger provides all the URLs and refspecs to
* check out the change.
*/
+ sh "sudo chown -R jenkins:users ."
checkout scm: [$class: 'GitSCM',
branches: [[name: env.GERRIT_BRANCH ]],
extensions: [
@@ -134,20 +136,20 @@ pipeline {
keepLongStdio: true
}
}
-
- stage ('Cleanup') {
- sh "sudo make distclean || : "
- }
}
}
}
}
- /*
- * The Gerrit Trigger will automatically post the "Verified" results back
- * to Gerrit but the verification publisher publishes extra stuff in the
- * "Code Review" section of the review.
- */
post {
+ always {
+ sh "sudo make distclean || : "
+ sh "sudo rm -rf tests/CI/output || : "
+ }
+ /*
+ * The Gerrit Trigger will automatically post the "Verified" results back
+ * to Gerrit but the verification publisher publishes extra stuff in the
+ * "Code Review" section of the review.
+ */
success {
gerritverificationpublisher verifyStatusValue: 1, verifyStatusCategory: 'Passed',
verifyStatusURL: '', verifyStatusComment: '',
--
GitLab