From d61a7a9ef2e89008c0f355f433fd320dce9799ba Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 22 Mar 2021 20:14:27 +0900 Subject: [PATCH] Jenkins update (#79) * Jenkins update * reorder --- Jenkinsfile | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b74e8e2111..9ac8aa40ea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,7 @@ pipeline { - agent any + agent { + label 'mm' + } stages { stage('Copy ROM') { @@ -18,9 +20,25 @@ pipeline { branch 'master' } steps { - sh 'python3 ./tools/progress.py csv >> /var/www/html/reports/progress_mm.us.rev1.csv' - sh 'python3 ./tools/progress.py csv -m >> /var/www/html/reports/progress_matching_mm.us.rev1.csv' - sh 'python3 ./tools/progress.py shield-json > /var/www/html/reports/progress_shield_mm.us.rev1.json' + sh 'mkdir reports' + sh 'python3 ./tools/progress.py csv >> reports/progress_mm.us.rev1.csv' + sh 'python3 ./tools/progress.py csv -m >> reports/progress_matching_mm.us.rev1.csv' + sh 'python3 ./tools/progress.py shield-json > reports/progress_shield_mm.us.rev1.json' + stash includes: 'reports/*', name: 'reports' + } + } + stage('Update Progress') { + when { + branch 'master' + } + agent{ + label 'master' + } + steps { + unstash 'reports' + sh 'cat reports/progress_mm.us.rev1.csv >> /var/www/html/reports/progress_mm.us.rev1.csv' + sh 'cat reports/progress_matching_mm.us.rev1.csv >> /var/www/html/reports/progress_matching_mm.us.rev1.csv' + sh 'cat reports/progress_shield_mm.us.rev1.json > /var/www/html/reports/progress_shield_mm.us.rev1.json' } } }