From 42880fab50cf5da50e51a06acd621b235a85f315 Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Wed, 3 Oct 2018 16:51:01 -0400
Subject: [PATCH] jenkins: Fix cleanup command redirection.
Fix redirection to /dev/null of cleanup commands. The '2' was being
interpreted as part of the command instead of part of the redirect.
Change-Id: I2e3a591b165e0288c4b82b9ef475fdfd5392a90a
---
tests/CI/gates.jenkinsfile | 4 ++--
tests/CI/periodics-daily.jenkinsfile | 4 ++--
tests/CI/ref_debug.jenkinsfile | 4 ++--
tests/CI/unittests.jenkinsfile | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/CI/gates.jenkinsfile b/tests/CI/gates.jenkinsfile
index 1f161d756c..e119f3c7aa 100644
--- a/tests/CI/gates.jenkinsfile
+++ b/tests/CI/gates.jenkinsfile
@@ -215,8 +215,8 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean 2&>/dev/null || : "
- sh "sudo rm -rf tests/CI/output 2&>/dev/null || : "
+ sh "sudo make distclean >/dev/null 2>&1 || : "
+ sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
}
/*
* 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 8c97379e07..3f3b7ab24c 100644
--- a/tests/CI/periodics-daily.jenkinsfile
+++ b/tests/CI/periodics-daily.jenkinsfile
@@ -140,8 +140,8 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean 2&>/dev/null || : "
- sh "sudo rm -rf tests/CI/output 2&>/dev/null || : "
+ sh "sudo make distclean >/dev/null 2>&1 || : "
+ sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
}
success {
echo "Reporting ${currentBuild.currentResult} Passed"
diff --git a/tests/CI/ref_debug.jenkinsfile b/tests/CI/ref_debug.jenkinsfile
index 1fa86884d2..d9871d315a 100644
--- a/tests/CI/ref_debug.jenkinsfile
+++ b/tests/CI/ref_debug.jenkinsfile
@@ -115,8 +115,8 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean 2&>/dev/null || : "
- sh "sudo rm -rf tests/CI/output 2&>/dev/null || : "
+ sh "sudo make distclean >/dev/null 2>&1 || : "
+ sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
}
success {
echo "Reporting ${currentBuild.currentResult} Passed"
diff --git a/tests/CI/unittests.jenkinsfile b/tests/CI/unittests.jenkinsfile
index 8cf9f4ac59..ed937f23da 100644
--- a/tests/CI/unittests.jenkinsfile
+++ b/tests/CI/unittests.jenkinsfile
@@ -169,8 +169,8 @@ pipeline {
}
post {
cleanup {
- sh "sudo make distclean 2&>/dev/null || : "
- sh "sudo rm -rf tests/CI/output 2&>/dev/null || : "
+ sh "sudo make distclean >/dev/null 2>&1 || : "
+ sh "sudo rm -rf tests/CI/output >/dev/null 2>&1 || : "
}
/*
* The Gerrit Trigger will automatically post the "Verified" results back
--
GitLab