From b63425f469cd91fcdb0cd4ddc166a4d90ad6ca8b Mon Sep 17 00:00:00 2001
From: George Joseph <gjoseph@digium.com>
Date: Fri, 19 Jul 2019 10:20:38 -0600
Subject: [PATCH] CI: Add cleanWs to cleanup steps in jenkinsfiles
We're at the point where there are enough Jenkins jobs for
Asterisk branches than even cleaned checkouts of Asterisk
will add up to more disk space than is available on the
in-memory workspace mount. Since we archive all relevent
artifacts anyway, there's no need to keep the workspace
around after the job finishes, whether it succeeds or fails.
Change-Id: I1cd3b73ebb045a987df0f62526d152a510210c39
---
tests/CI/gates.jenkinsfile | 11 +++++------
tests/CI/periodics-daily.jenkinsfile | 3 +--
tests/CI/ref_debug.jenkinsfile | 9 ++++-----
tests/CI/unittests.jenkinsfile | 3 +--
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index a90b0cf8e0..ca43a60034 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -54,7 +54,7 @@ pipeline {
onUnstable: false
]
}
-
+
agent {
/* All of the stages need to be performed on a docker host */
label "swdev-docker"
@@ -78,9 +78,9 @@ pipeline {
manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)
stage ("Checkout") {
- sh "sudo chown -R jenkins:users ."
+ sh "sudo chown -R jenkins:users ."
env.GERRIT_PROJECT_URL = env.GIT_URL.replaceAll(/[^\/]+$/, env.GERRIT_PROJECT)
-
+
/*
* Jenkins has already automatically checked out the base branch
* for this change but we now need to check out the change itself
@@ -191,7 +191,7 @@ pipeline {
}
sh "sudo rm -rf ${groupDir} || : "
-
+
withCredentials([usernamePassword(credentialsId: "${JENKINS_GERRIT_CREDS}",
passwordVariable: 'GERRIT_USER_PW', usernameVariable: 'GERRIT_USER_NAME')]) {
checkout scm: [$class: 'GitSCM',
@@ -237,8 +237,7 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean >/dev/null 2>&1 || : "
- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
+ cleanWs deleteDirs: true, notFailBuild: true
}
/*
* The Gerrit Trigger will automatically post the "Verified" results back
diff --git a/tests/CI/periodics-daily.jenkinsfile b/tests/CI/periodics-daily.jenkinsfile
index ae5a5f440c..5a37bb9c21 100644
--- a/tests/CI/periodics-daily.jenkinsfile
+++ b/tests/CI/periodics-daily.jenkinsfile
@@ -157,8 +157,7 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean >/dev/null 2>&1 || : "
- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
+ cleanWs deleteDirs: true, notFailBuild: true
}
success {
echo "Reporting ${currentBuild.currentResult} Passed"
diff --git a/tests/CI/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile
index 0e0f49c1bd..9e20600e09 100644
--- a/tests/CI/ref_debug.jenkinsfile
+++ b/tests/CI/ref_debug.jenkinsfile
@@ -26,7 +26,7 @@ pipeline {
triggers {
cron 'H H(0-4) * * 0'
}
-
+
agent {
/* All of the stages need to be performed on a docker host */
label "swdev-docker"
@@ -40,7 +40,7 @@ pipeline {
manager.createSummary("/plugin/workflow-job/images/48x48/pipelinejob.png").appendText("Docker Host: ${NODE_NAME}", false)
stage ("Checkout") {
- sh "sudo chown -R jenkins:users ."
+ sh "sudo chown -R jenkins:users ."
sh "printenv | sort"
sh "sudo tests/CI/setupJenkinsEnvironment.sh"
}
@@ -93,7 +93,7 @@ pipeline {
}
sh "sudo rm -rf ${groupDir} || : "
-
+
checkout scm: [$class: 'GitSCM',
branches: [[name: "${BRANCH_NAME}"]],
extensions: [
@@ -127,8 +127,7 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean >/dev/null 2>&1 || : "
- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
+ cleanWs deleteDirs: true, notFailBuild: true
}
success {
echo "Reporting ${currentBuild.currentResult} Passed"
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 3961cf538b..c2467d7fb0 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -181,8 +181,7 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean >/dev/null 2>&1 || : "
- sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
+ cleanWs deleteDirs: true, notFailBuild: true
}
/*
* The Gerrit Trigger will automatically post the "Verified" results back
--
GitLab