This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new 56910db archiving fixes: handle sockets better (#420)
56910db is described below
commit 56910db88e4cf7312d133eb9f2d2c13ca393bcf8
Author: Brian Neradt <[email protected]>
AuthorDate: Thu Feb 12 17:21:58 2026 -0600
archiving fixes: handle sockets better (#420)
Our previous exclusion regex didn't ignore the uds.socket file. This
made the archiving step fail prematurely, leading to partical sandbox
archives. This fixes that by more generically removing all socket files
via a find command and updating the regex.
---
jenkins/branch/autest.pipeline | 4 +++-
jenkins/branch/quiche.pipeline | 4 +++-
jenkins/github/autest.pipeline | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/jenkins/branch/autest.pipeline b/jenkins/branch/autest.pipeline
index 20a4e5b..3002e24 100644
--- a/jenkins/branch/autest.pipeline
+++ b/jenkins/branch/autest.pipeline
@@ -169,6 +169,8 @@ pipeline {
if [ -n "$(ls -A
/tmp/sandbox/)" ]; then
touch
${export_dir}/Autest_failures
cp -rf /tmp/sandbox/
"${export_dir}"
+ # Remove socket files
so they don't break archiveArtifacts.
+ find "${export_dir}"
-type s -delete
ls "${export_dir}"
sudo chmod -R 777
${WORKSPACE}
exit 1
@@ -194,7 +196,7 @@ pipeline {
always {
// We exclude socket files because archiveArtifacts
doesn't deal well with
// their file type.
- archiveArtifacts artifacts: 'output/**/*', fingerprint:
false, allowEmptyArchive: true, excludes: '**/*.sock, **/cache.db'
+ archiveArtifacts artifacts: 'output/**/*', fingerprint:
false, allowEmptyArchive: true, excludes: '**/*.sock, **/*.socket, **/cache.db'
}
cleanup {
cleanWs()
diff --git a/jenkins/branch/quiche.pipeline b/jenkins/branch/quiche.pipeline
index 8c25907..bd52e8c 100644
--- a/jenkins/branch/quiche.pipeline
+++ b/jenkins/branch/quiche.pipeline
@@ -108,6 +108,8 @@ pipeline {
if [ -n "$(ls -A
/tmp/sandbox/)" ]; then
touch
${export_dir}/Autest_failures
cp -rf /tmp/sandbox/
"${export_dir}"
+ # Remove socket files
so they don't break archiveArtifacts.
+ find "${export_dir}"
-type s -delete
ls "${export_dir}"
sudo chmod -R 777
${WORKSPACE}
exit 1
@@ -125,7 +127,7 @@ pipeline {
always {
// We exclude socket files because archiveArtifacts
doesn't deal well with
// their file type.
- archiveArtifacts artifacts: 'output/**/*', fingerprint:
false, allowEmptyArchive: true, excludes: '**/*.sock, **/cache.db'
+ archiveArtifacts artifacts: 'output/**/*', fingerprint:
false, allowEmptyArchive: true, excludes: '**/*.sock, **/*.socket, **/cache.db'
}
cleanup {
cleanWs()
diff --git a/jenkins/github/autest.pipeline b/jenkins/github/autest.pipeline
index 722e6b3..3609482 100644
--- a/jenkins/github/autest.pipeline
+++ b/jenkins/github/autest.pipeline
@@ -183,6 +183,8 @@ pipeline {
echo "AuTest tests failed."
touch ${export_dir}/Autest_failures
cp -rf /tmp/sandbox/ "${export_dir}"
+ # Remove socket files so they don't break archiveArtifacts.
+ find "${export_dir}" -type s -delete
ls "${export_dir}"
sudo chmod -R 777 ${WORKSPACE}
exit 1
@@ -201,7 +203,7 @@ pipeline {
always {
// We exclude socket files because archiveArtifacts doesn't deal well
with
// their file type.
- archiveArtifacts artifacts: "output/${GITHUB_PR_NUMBER}/**/*",
fingerprint: false, allowEmptyArchive: true, excludes: '**/*.sock, **/cache.db'
+ archiveArtifacts artifacts: "output/${GITHUB_PR_NUMBER}/**/*",
fingerprint: false, allowEmptyArchive: true, excludes: '**/*.sock, **/*.socket,
**/cache.db'
echo "See the build job description for a link to the sandbox."
}
cleanup {
