From 148a95d44448dad9927be969330788c94d272f76 Mon Sep 17 00:00:00 2001 From: Justin Reese Date: Mon, 6 Jul 2020 14:47:14 -0400 Subject: [PATCH 1/6] Put date/timestamp in filename of YAML manifest, and tar it up with nodes and edges files in tar file --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7bfb6cd9..b0e8bb9a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,6 +85,8 @@ pipeline { steps { dir('./gitrepo') { sh '. venv/bin/activate && python3.7 run.py merge' + sh 'cp merged_graph_stats.yaml merged_graph_stats_$(date +"%Y%m%d").yaml' + sh 'tar -rvf data/merged/merged-kg.tar merged_graph_stats_$(date +"%Y%m%d").yaml' sh 'pigz data/merged/merged-kg.tar' sh 'pigz data/merged/merged-kg.nt' } From dc755bdd706bffbe5fa2ae39969125f1841a2dc5 Mon Sep 17 00:00:00 2001 From: Justin Reese Date: Mon, 6 Jul 2020 18:49:17 -0400 Subject: [PATCH 2/6] Add build start date as env var --- Jenkinsfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b0e8bb9a..d12edb5a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,10 @@ pipeline { agent any + + environment { + def BUILDSTARTDATE = sh(script: "echo `date +%Y%m%d`", returnStdout: true).trim() + } + options { timestamps() } @@ -85,8 +90,8 @@ pipeline { steps { dir('./gitrepo') { sh '. venv/bin/activate && python3.7 run.py merge' - sh 'cp merged_graph_stats.yaml merged_graph_stats_$(date +"%Y%m%d").yaml' - sh 'tar -rvf data/merged/merged-kg.tar merged_graph_stats_$(date +"%Y%m%d").yaml' + sh "cp merged_graph_stats.yaml merged_graph_stats_$BUILDSTARTDATE.yaml" + sh "tar -rvf data/merged/merged-kg.tar merged_graph_stats_$BUILDSTARTDATE.yaml" sh 'pigz data/merged/merged-kg.tar' sh 'pigz data/merged/merged-kg.nt' } From 4d17202a44f5213b0cf13fdfcac1b8dd8225187c Mon Sep 17 00:00:00 2001 From: Justin Reese Date: Mon, 6 Jul 2020 18:54:28 -0400 Subject: [PATCH 3/6] Use new env var --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d12edb5a..abbf0634 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,8 +29,8 @@ pipeline { sh 'echo "$BRANCH_NAME"' sh 'cat env.txt' sh 'cat branch.txt' - sh 'echo $START_DAY > dow.txt' - sh 'echo "$START_DAY"' + sh "echo $BUILDSTARTDATE > dow.txt" + sh "echo $BUILDSTARTDATE" }) } } From ba591af33ea88aa3028fec97d21a14bcddb70d1d Mon Sep 17 00:00:00 2001 From: Justin Reese Date: Tue, 7 Jul 2020 10:32:46 -0400 Subject: [PATCH 4/6] Troubleshoot tar command --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index abbf0634..7354fcb9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -91,7 +91,7 @@ pipeline { dir('./gitrepo') { sh '. venv/bin/activate && python3.7 run.py merge' sh "cp merged_graph_stats.yaml merged_graph_stats_$BUILDSTARTDATE.yaml" - sh "tar -rvf data/merged/merged-kg.tar merged_graph_stats_$BUILDSTARTDATE.yaml" + // sh "tar -rvf data/merged/merged-kg.tar merged_graph_stats_$BUILDSTARTDATE.yaml" sh 'pigz data/merged/merged-kg.tar' sh 'pigz data/merged/merged-kg.nt' } From ff19f8ab8c4a78bce6d9375084601266d2694a24 Mon Sep 17 00:00:00 2001 From: Justin Reese Date: Wed, 8 Jul 2020 10:57:00 -0400 Subject: [PATCH 5/6] Try to placate Groovy's env var interpolation --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7354fcb9..59050a7f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,8 +90,8 @@ pipeline { steps { dir('./gitrepo') { sh '. venv/bin/activate && python3.7 run.py merge' - sh "cp merged_graph_stats.yaml merged_graph_stats_$BUILDSTARTDATE.yaml" - // sh "tar -rvf data/merged/merged-kg.tar merged_graph_stats_$BUILDSTARTDATE.yaml" + sh "cp merged_graph_stats.yaml merged_graph_stats_${BUILDSTARTDATE}.yaml" + sh "tar -rvf data/merged/merged-kg.tar merged_graph_stats_${BUILDSTARTDATE}.yaml" sh 'pigz data/merged/merged-kg.tar' sh 'pigz data/merged/merged-kg.nt' } From 992701573adf2a9ca754b59dc921954600018f03 Mon Sep 17 00:00:00 2001 From: Justin Reese Date: Wed, 8 Jul 2020 13:33:08 -0400 Subject: [PATCH 6/6] Fix quotes in env var --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 59050a7f..08f51dd4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent any environment { - def BUILDSTARTDATE = sh(script: "echo `date +%Y%m%d`", returnStdout: true).trim() + BUILDSTARTDATE = sh(script: "echo `date +%Y%m%d`", returnStdout: true).trim() } options { @@ -90,8 +90,9 @@ pipeline { steps { dir('./gitrepo') { sh '. venv/bin/activate && python3.7 run.py merge' - sh "cp merged_graph_stats.yaml merged_graph_stats_${BUILDSTARTDATE}.yaml" - sh "tar -rvf data/merged/merged-kg.tar merged_graph_stats_${BUILDSTARTDATE}.yaml" + sh 'env' + sh 'cp merged_graph_stats.yaml merged_graph_stats_$BUILDSTARTDATE.yaml' + sh 'tar -rvf data/merged/merged-kg.tar merged_graph_stats_$BUILDSTARTDATE.yaml' sh 'pigz data/merged/merged-kg.tar' sh 'pigz data/merged/merged-kg.nt' }