From 666d0580a97aa250c0ad1c2e2270e804189b8f12 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 10 Feb 2019 17:23:56 -0700 Subject: [PATCH] [CI]: cleanup workspaces, document, simplify tidy - tidy job: use only one agent - add documentation - add cleanup of workspace (otherwise we run out of disk space, yay) --- contrib/ci/Jenkinsfile.mark | 16 +++++++++++----- contrib/ci/Jenkinsfile.osx | 10 ++++++++++ contrib/ci/Jenkinsfile.tidy | 33 +++++++++++++++++---------------- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/contrib/ci/Jenkinsfile.mark b/contrib/ci/Jenkinsfile.mark index 37aa15478c..78f8e02c67 100644 --- a/contrib/ci/Jenkinsfile.mark +++ b/contrib/ci/Jenkinsfile.mark @@ -1,10 +1,14 @@ #!groovy -// This Jenkinsfile is used to mark jobs as "pending" as quickly as -// possible. The other longer running jobs only set the status to pending once -// they start running. -// -// See https://jenkins.tjhei.info/job/dealii-mark/ for details. +/* + +This Jenkinsfile is used to mark jobs as "pending" as quickly as possible. The +other longer running jobs only set the status to pending once they start +running. + +See https://jenkins.tjhei.info/job/dealii-mark/ for details. + +*/ /* Settings to apply inside Jenkins: @@ -28,6 +32,8 @@ pipeline } } + post { cleanup { cleanWs() } } + stages { stage("check") diff --git a/contrib/ci/Jenkinsfile.osx b/contrib/ci/Jenkinsfile.osx index fbee05a768..5a404aabb7 100644 --- a/contrib/ci/Jenkinsfile.osx +++ b/contrib/ci/Jenkinsfile.osx @@ -1,5 +1,13 @@ #!groovy +/* + +This Jenkins job runs a build on OSX + +See https://jenkins.tjhei.info/job/dealii-osx/ for details. + +*/ + /* Settings to apply inside Jenkins: - discover pull requests (remove branches/master) @@ -19,6 +27,8 @@ pipeline } } + post { cleanup { cleanWs() } } + stages { stage("check") diff --git a/contrib/ci/Jenkinsfile.tidy b/contrib/ci/Jenkinsfile.tidy index 05c0134826..82d7e69a39 100644 --- a/contrib/ci/Jenkinsfile.tidy +++ b/contrib/ci/Jenkinsfile.tidy @@ -1,5 +1,13 @@ #!groovy +/* + +This Jenkins job runs clang-tidy on the code base + +See https://jenkins.tjhei.info/job/dealii-tidy/ for details. + +*/ + /* Settings to apply inside Jenkins: - discover pull requests (remove branches/master) @@ -13,7 +21,15 @@ Settings to apply inside Jenkins: pipeline { - agent none + agent + { + docker + { + image 'tjhei/candi-base-clang' + } + } + + post { cleanup { cleanWs() } } stages { @@ -25,14 +41,6 @@ pipeline } } - agent - { - docker - { - image 'dealii/indent' - } - } - steps { githubNotify context: 'tidy', description: 'pending...', status: 'PENDING' @@ -56,13 +64,6 @@ pipeline stage('build') { - agent - { - docker - { - image 'tjhei/candi-base-clang' - } - } steps { timeout(time: 2, unit: 'HOURS') -- 2.39.5