From 55725e2b3cce48776c59da0bb366c5ae45a77449 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:04:28 -0500 Subject: [PATCH 01/14] First stab at a Jenkinsfile --- Jenkinsfile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..0fc1096 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,25 @@ +pipeline { + agent { + docker { + image 'rust:1.48' + args '-v "$PWD":/usr/src/image-api' + } + } + + stages { + stage('build') { + steps { + echo $PWD + sh 'cargo build --release' + archiveArtifacts '**/target/release/**', fingerprint: true + } + } + + stage('test') { + steps { + sh 'cargo test' + } + } + } +} + -- 2.49.1 From 19dea67e3f09810dbdf4fc190a49d270cf653d78 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:07:11 -0500 Subject: [PATCH 02/14] Fix archive syntax --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0fc1096..78b1012 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { echo $PWD sh 'cargo build --release' - archiveArtifacts '**/target/release/**', fingerprint: true + archiveArtifacts artifacts: '**/target/release/**', fingerprint: true } } -- 2.49.1 From fcc520af1a07f6072b50dc20a9139bc8f579af20 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:11:24 -0500 Subject: [PATCH 03/14] Try and fix docker image args --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 78b1012..f21345d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'rust:1.48' - args '-v "$PWD":/usr/src/image-api' + args '-v $PWD:/usr/src/image-api' } } -- 2.49.1 From c482912fd86b0d6bd2fa6ecf8ddf21ba8a504cc6 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:13:35 -0500 Subject: [PATCH 04/14] Wrestling with string interpolation --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f21345d..e3acfb5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'rust:1.48' - args '-v $PWD:/usr/src/image-api' + args "-v '$PWD':/usr/src/image-api" } } -- 2.49.1 From 608c6f8ddb846df56ff404013afc1bf191e8cf6a Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:15:48 -0500 Subject: [PATCH 05/14] Try escaping to prevent Groovy picking up variable --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e3acfb5..2c504e8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'rust:1.48' - args "-v '$PWD':/usr/src/image-api" + args "-v '\$PWD':/usr/src/image-api" } } -- 2.49.1 From d500fae440f3e97bacd340fb2abc7207c5659e4f Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:17:30 -0500 Subject: [PATCH 06/14] Still trying to fix PWD command --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c504e8..860ed55 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'rust:1.48' - args "-v '\$PWD':/usr/src/image-api" + args '-v "\$PWD":/usr/src/image-api' } } -- 2.49.1 From 5efc849acb4665e2d23311175a4286284f182b4c Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:21:40 -0500 Subject: [PATCH 07/14] Remove extra quotes and escaping --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 860ed55..f21345d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'rust:1.48' - args '-v "\$PWD":/usr/src/image-api' + args '-v $PWD:/usr/src/image-api' } } -- 2.49.1 From 067f665998d0b7a54b83c965909ce417fb201449 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:25:40 -0500 Subject: [PATCH 08/14] Escape --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f21345d..b0c12f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'rust:1.48' - args '-v $PWD:/usr/src/image-api' + args '-v \$PWD:/usr/src/image-api' } } -- 2.49.1 From 7e5257dbb01c1c7f6cb6f0b39cf79445a770e649 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:27:05 -0500 Subject: [PATCH 09/14] Curly braces --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b0c12f8..4c13a61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,7 @@ pipeline { agent { docker { image 'rust:1.48' - args '-v \$PWD:/usr/src/image-api' + args '-v ${PWD}:/usr/src/image-api' } } -- 2.49.1 From 505cd2f2e3857dcf9c3880ad3aa3f687c0e3f023 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 15:29:01 -0500 Subject: [PATCH 10/14] Fix the actual error.. --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4c13a61..0afe90c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,14 +2,14 @@ pipeline { agent { docker { image 'rust:1.48' - args '-v ${PWD}:/usr/src/image-api' + args '-v "$PWD":/usr/src/image-api' } } stages { stage('build') { steps { - echo $PWD + sh 'echo $PWD' sh 'cargo build --release' archiveArtifacts artifacts: '**/target/release/**', fingerprint: true } -- 2.49.1 From 5f1bf58f359a5739605aa532eff932357a28221a Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 16:00:59 -0500 Subject: [PATCH 11/14] Create env file for tests and only archive binary --- Jenkinsfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0afe90c..b7b9611 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,17 +9,21 @@ pipeline { stages { stage('build') { steps { - sh 'echo $PWD' - sh 'cargo build --release' - archiveArtifacts artifacts: '**/target/release/**', fingerprint: true + sh 'echo $PWD' + sh 'cargo build --release' + archiveArtifacts artifacts: '**/target/release/image-api' fingerprint: true } } stage('test') { steps { - sh 'cargo test' + sh 'echo "BASE_PATH=$PWD" > .env' + sh 'cargo test' + } + + post { + sh 'rm -f .env' } } } } - -- 2.49.1 From c2a485e152fa7823cfcb52ee4c63894d8106e5f1 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 16:03:08 -0500 Subject: [PATCH 12/14] Fix missing comma --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7b9611..641d42a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { sh 'echo $PWD' sh 'cargo build --release' - archiveArtifacts artifacts: '**/target/release/image-api' fingerprint: true + archiveArtifacts artifacts: '**/target/release/image-api', fingerprint: true } } -- 2.49.1 From 31ca8f2125194c5dfc4b907b0f95119d1264802f Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 16:06:33 -0500 Subject: [PATCH 13/14] Fix post test cleanup --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 641d42a..b93e57f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,9 @@ pipeline { } post { - sh 'rm -f .env' + always { + sh 'rm -f .env' + } } } } -- 2.49.1 From a873f5fc0f2b5c687a16e46bcdeeb5edf775ebe7 Mon Sep 17 00:00:00 2001 From: Cameron Cordes Date: Tue, 2 Feb 2021 16:11:20 -0500 Subject: [PATCH 14/14] Clean up echoing working directory --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b93e57f..9bbecdb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,6 @@ pipeline { stages { stage('build') { steps { - sh 'echo $PWD' sh 'cargo build --release' archiveArtifacts artifacts: '**/target/release/image-api', fingerprint: true } -- 2.49.1