From a6a68a3eadbd461ad83e1b398d2690019a47444e Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 00:02:31 +0200 Subject: [PATCH 01/25] added scripts --- Jenkinsfile | 22 +++++++++++++++++++--- jenkins/buildFrontend.sh | 9 +++++++++ jenkins/deployBackend.sh | 0 jenkins/deployFrontend.sh | 0 4 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 jenkins/buildFrontend.sh create mode 100644 jenkins/deployBackend.sh create mode 100644 jenkins/deployFrontend.sh diff --git a/Jenkinsfile b/Jenkinsfile index cc4c8cd..c2f919d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,10 +2,26 @@ pipeline { agent any stages { - stage('Do nothing') { + stage('Environment') { steps { - sh '/bin/true' + sh 'git --version' + sh 'printenv' + } + } + stage('Build Frontend') { + steps { + sh './jenkins/buildFrontend.sh' + } + } + stage('Deploy Backend') { + steps { + sh './jenkins/deployBackend.sh' + } + } + stage('Deploy Frontend') { + steps { + sh './jenkins/deployFrontend.sh' } } } -} \ No newline at end of file +} diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh new file mode 100644 index 0000000..6460956 --- /dev/null +++ b/jenkins/buildFrontend.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +cd ../frontend + +echo 'Install neccessary Packages' +yarn install + +echo '' +yarn run build diff --git a/jenkins/deployBackend.sh b/jenkins/deployBackend.sh new file mode 100644 index 0000000..e69de29 diff --git a/jenkins/deployFrontend.sh b/jenkins/deployFrontend.sh new file mode 100644 index 0000000..e69de29 -- 2.49.1 From 9ad59e21438df753fa4fac00ca941add4b4087ce Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 20:48:01 +0200 Subject: [PATCH 02/25] test --- Jenkinsfile | 1 + jenkins/buildFrontend.sh | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c2f919d..9bec37e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { steps { sh 'git --version' sh 'printenv' + sh '$env.BRANCH_NAME' } } stage('Build Frontend') { diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 6460956..ccb79cf 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -1,9 +1,11 @@ #!/usr/bin/env sh cd ../frontend - -echo 'Install neccessary Packages' -yarn install - -echo '' -yarn run build +if [$env.BRANCH_NAME = "edit-jenkinsfile"]; then + echo 'Install neccessary Packages' + yarn install + echo 'Build Frontend for Production' + yarn run build +else + echo 'Not in master Branch' +fi -- 2.49.1 From 413729b847d025859a340b320b7b95f066e3bbd2 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 20:50:37 +0200 Subject: [PATCH 03/25] test2 --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9bec37e..c2f919d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,6 @@ pipeline { steps { sh 'git --version' sh 'printenv' - sh '$env.BRANCH_NAME' } } stage('Build Frontend') { -- 2.49.1 From 86a56bba4631671d260b15f7c794071fac75cf70 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 20:53:22 +0200 Subject: [PATCH 04/25] test3 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c2f919d..36e4e42 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,17 +10,17 @@ pipeline { } stage('Build Frontend') { steps { - sh './jenkins/buildFrontend.sh' + sh 'sudo ./jenkins/buildFrontend.sh' } } stage('Deploy Backend') { steps { - sh './jenkins/deployBackend.sh' + sh 'sudo ./jenkins/deployBackend.sh' } } stage('Deploy Frontend') { steps { - sh './jenkins/deployFrontend.sh' + sh 'sudo ./jenkins/deployFrontend.sh' } } } -- 2.49.1 From 03f9334721f2a5898600e2fa512d7634bba5c247 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 20:55:34 +0200 Subject: [PATCH 05/25] test4 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 36e4e42..1da33f1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,17 +10,17 @@ pipeline { } stage('Build Frontend') { steps { - sh 'sudo ./jenkins/buildFrontend.sh' + sh 'sudo bash ./jenkins/buildFrontend.sh' } } stage('Deploy Backend') { steps { - sh 'sudo ./jenkins/deployBackend.sh' + sh 'sudo bash ./jenkins/deployBackend.sh' } } stage('Deploy Frontend') { steps { - sh 'sudo ./jenkins/deployFrontend.sh' + sh 'sudo bash ./jenkins/deployFrontend.sh' } } } -- 2.49.1 From ef65cc5c35ae3c5943ef03a5c3b9a24c70c5325c Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 20:58:46 +0200 Subject: [PATCH 06/25] test5 --- jenkins/buildFrontend.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index ccb79cf..818847c 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -1,7 +1,9 @@ #!/usr/bin/env sh +echo $BRANCH_NAME +echo $PWD cd ../frontend -if [$env.BRANCH_NAME = "edit-jenkinsfile"]; then +if [$BRANCH_NAME = "edit-jenkinsfile"]; then echo 'Install neccessary Packages' yarn install echo 'Build Frontend for Production' -- 2.49.1 From dd219e2cc6ad8a05f36965c9deae8e2f9a1237c8 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:18:19 +0200 Subject: [PATCH 07/25] test6 --- Jenkinsfile | 5 +++++ jenkins/buildFrontend.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1da33f1..e0879a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,12 @@ pipeline { } } stage('Build Frontend') { + environment { + AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') + } steps { + sh 'echo $AN_ACCESS_KEY' + sh 'echo $BRANCH_NAME' sh 'sudo bash ./jenkins/buildFrontend.sh' } } diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 818847c..9a1e756 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -2,7 +2,7 @@ echo $BRANCH_NAME echo $PWD -cd ../frontend +cd ./frontend if [$BRANCH_NAME = "edit-jenkinsfile"]; then echo 'Install neccessary Packages' yarn install -- 2.49.1 From a68173098955c0352487864d63a893ecb69b0209 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:29:07 +0200 Subject: [PATCH 08/25] test7 --- Jenkinsfile | 5 +++++ jenkins/buildFrontend.sh | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e0879a3..a86c91b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,6 +16,11 @@ pipeline { sh 'echo $AN_ACCESS_KEY' sh 'echo $BRANCH_NAME' sh 'sudo bash ./jenkins/buildFrontend.sh' + SCRIPT_OUTPUT = sh ( + script: 'sudo bash ./jenkins/buildFrontend.sh', + returnStdout: true + ).trim() + echo "Script Output: ${SCRIPT_OUTPUT}" } } stage('Deploy Backend') { diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 9a1e756..14ea95c 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -1,9 +1,8 @@ #!/usr/bin/env sh -echo $BRANCH_NAME -echo $PWD cd ./frontend -if [$BRANCH_NAME = "edit-jenkinsfile"]; then +echo "$BRANCH_NAME" +if ["$BRANCH_NAME" = "edit-jenkinsfile"]; then echo 'Install neccessary Packages' yarn install echo 'Build Frontend for Production' -- 2.49.1 From 3b83c97b89d9aaedb72c3ffa047088a6fa5c4034 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:32:59 +0200 Subject: [PATCH 09/25] test7 --- Jenkinsfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a86c91b..1e04d2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,10 +16,7 @@ pipeline { sh 'echo $AN_ACCESS_KEY' sh 'echo $BRANCH_NAME' sh 'sudo bash ./jenkins/buildFrontend.sh' - SCRIPT_OUTPUT = sh ( - script: 'sudo bash ./jenkins/buildFrontend.sh', - returnStdout: true - ).trim() + def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true).trim() echo "Script Output: ${SCRIPT_OUTPUT}" } } -- 2.49.1 From ff8a2a9dad8c36070b6d3a4860a956ae189e699a Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:35:06 +0200 Subject: [PATCH 10/25] test8 --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1e04d2d..20df3a3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,9 +15,10 @@ pipeline { steps { sh 'echo $AN_ACCESS_KEY' sh 'echo $BRANCH_NAME' - sh 'sudo bash ./jenkins/buildFrontend.sh' - def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true).trim() - echo "Script Output: ${SCRIPT_OUTPUT}" + script{ + def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true).trim() + echo "Script Output: ${SCRIPT_OUTPUT}" + } } } stage('Deploy Backend') { -- 2.49.1 From b81cb7f3e6dbde02b1143b51e3f65ad7437088b2 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:39:04 +0200 Subject: [PATCH 11/25] test9 --- Jenkinsfile | 1 - jenkins/buildFrontend.sh | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 20df3a3..8d07d91 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,6 @@ pipeline { AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') } steps { - sh 'echo $AN_ACCESS_KEY' sh 'echo $BRANCH_NAME' script{ def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true).trim() diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 14ea95c..4780e89 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -2,11 +2,12 @@ cd ./frontend echo "$BRANCH_NAME" -if ["$BRANCH_NAME" = "edit-jenkinsfile"]; then +if test "$BRANCH_NAME" = "edit-jenkinsfile" +then echo 'Install neccessary Packages' yarn install echo 'Build Frontend for Production' yarn run build else - echo 'Not in master Branch' + echo 'Not in master branch' fi -- 2.49.1 From 0c540cf903fe275ec0837bf1ac85122f41b46f0a Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:41:04 +0200 Subject: [PATCH 12/25] test10 --- Jenkinsfile | 2 +- jenkins/buildFrontend.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8d07d91..9b767f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { steps { sh 'echo $BRANCH_NAME' script{ - def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true).trim() + def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true) echo "Script Output: ${SCRIPT_OUTPUT}" } } diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 4780e89..69a6462 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh -cd ./frontend -echo "$BRANCH_NAME" +cd ./Frontend + if test "$BRANCH_NAME" = "edit-jenkinsfile" then echo 'Install neccessary Packages' @@ -9,5 +9,5 @@ then echo 'Build Frontend for Production' yarn run build else - echo 'Not in master branch' + echo "$BRANCH_NAME" fi -- 2.49.1 From e5d74a47ea20cb4b690c9a7f18b7e28e9954f0f0 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:44:41 +0200 Subject: [PATCH 13/25] test11 --- jenkins/buildFrontend.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 69a6462..c77f839 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -9,5 +9,5 @@ then echo 'Build Frontend for Production' yarn run build else - echo "$BRANCH_NAME" + echo "$env.BRANCH_NAME" fi -- 2.49.1 From 5bd9a5ec4c9ab351c61882751952e9c74e2ab6de Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:56:22 +0200 Subject: [PATCH 14/25] test12 --- Jenkinsfile | 3 ++- jenkins/buildFrontend.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9b767f7..116377d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,8 @@ pipeline { steps { sh 'echo $BRANCH_NAME' script{ - def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh',returnStdout: true) + + def SCRIPT_OUTPUT = sh (script: 'bash -c \" source ./jenkins/buildFrontend.sh ${BRANCH_NAME}\""',returnStdout: true) echo "Script Output: ${SCRIPT_OUTPUT}" } } diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index c77f839..210a908 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -9,5 +9,5 @@ then echo 'Build Frontend for Production' yarn run build else - echo "$env.BRANCH_NAME" + echo $BRANCH_NAME fi -- 2.49.1 From 07c5142b8bb7947f0aaa891affcb04191b0ae198 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 21:59:52 +0200 Subject: [PATCH 15/25] test13 --- Jenkinsfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 116377d..6b5fac7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,11 +14,7 @@ pipeline { } steps { sh 'echo $BRANCH_NAME' - script{ - - def SCRIPT_OUTPUT = sh (script: 'bash -c \" source ./jenkins/buildFrontend.sh ${BRANCH_NAME}\""',returnStdout: true) - echo "Script Output: ${SCRIPT_OUTPUT}" - } + sh 'sudo bash -c \" source ./jenkins/buildFrontend.sh ${BRANCH_NAME}\""' } } stage('Deploy Backend') { -- 2.49.1 From 39bea9a9d50e3fd98ad3f970a6b1b8582febca6f Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 22:04:02 +0200 Subject: [PATCH 16/25] test14 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6b5fac7..b143c7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { } steps { sh 'echo $BRANCH_NAME' - sh 'sudo bash -c \" source ./jenkins/buildFrontend.sh ${BRANCH_NAME}\""' + sh 'sudo bash ./jenkins/buildFrontend.sh ${BRANCH_NAME}' } } stage('Deploy Backend') { -- 2.49.1 From 846775a7c240dc9b6a85b17608b2c3fda85cd656 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 22:07:07 +0200 Subject: [PATCH 17/25] test15 --- Jenkinsfile | 5 ++++- jenkins/buildFrontend.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b143c7d..5e136e4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,10 @@ pipeline { } steps { sh 'echo $BRANCH_NAME' - sh 'sudo bash ./jenkins/buildFrontend.sh ${BRANCH_NAME}' + script{ + def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh ${BRANCH_NAME}',returnStdout: true) + echo "Script Output: ${SCRIPT_OUTPUT}" + } } } stage('Deploy Backend') { diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 210a908..aa1fe86 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -cd ./Frontend +cd ./frontend if test "$BRANCH_NAME" = "edit-jenkinsfile" then -- 2.49.1 From 0c033dd67a9d84c4dcc52422c29c9ac902ac2b0e Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 22:13:53 +0200 Subject: [PATCH 18/25] test17 --- jenkins/buildFrontend.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index aa1fe86..63f6107 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -9,5 +9,5 @@ then echo 'Build Frontend for Production' yarn run build else - echo $BRANCH_NAME + echo $1 fi -- 2.49.1 From 904e0fa57d9d4e68a11a0abab415652cd0e596af Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 22:19:47 +0200 Subject: [PATCH 19/25] test18 --- jenkins/buildFrontend.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 63f6107..1993a48 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -2,7 +2,7 @@ cd ./frontend -if test "$BRANCH_NAME" = "edit-jenkinsfile" +if test "$1" = "edit-jenkinsfile" then echo 'Install neccessary Packages' yarn install -- 2.49.1 From 682a4121d3e4f327318e3f9d4dc130c992e9228f Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 22:31:02 +0200 Subject: [PATCH 20/25] build only for master --- jenkins/buildFrontend.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index 1993a48..cf9bb55 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -2,12 +2,12 @@ cd ./frontend -if test "$1" = "edit-jenkinsfile" +if test "$1" = "master" then echo 'Install neccessary Packages' yarn install echo 'Build Frontend for Production' yarn run build else - echo $1 + echo "Skipping for non-master branch" fi -- 2.49.1 From 7dd2288654677d97609e8981602b905527d44672 Mon Sep 17 00:00:00 2001 From: Hawk Date: Wed, 13 May 2020 22:32:02 +0200 Subject: [PATCH 21/25] build frontend now working --- Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5e136e4..554bae8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,11 +9,7 @@ pipeline { } } stage('Build Frontend') { - environment { - AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') - } steps { - sh 'echo $BRANCH_NAME' script{ def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh ${BRANCH_NAME}',returnStdout: true) echo "Script Output: ${SCRIPT_OUTPUT}" @@ -21,11 +17,17 @@ pipeline { } } stage('Deploy Backend') { + environment { + AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') + } steps { sh 'sudo bash ./jenkins/deployBackend.sh' } } stage('Deploy Frontend') { + environment { + AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') + } steps { sh 'sudo bash ./jenkins/deployFrontend.sh' } -- 2.49.1 From c546246b6d883be5637ab7d718c1a5aed348f97a Mon Sep 17 00:00:00 2001 From: Hawk Date: Fri, 15 May 2020 22:25:52 +0200 Subject: [PATCH 22/25] test scp1 --- Jenkinsfile | 9 ++++++--- jenkins/deployBackend.sh | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 554bae8..b0bab46 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,8 +11,8 @@ pipeline { stage('Build Frontend') { steps { script{ - def SCRIPT_OUTPUT = sh (script: 'sudo bash ./jenkins/buildFrontend.sh ${BRANCH_NAME}',returnStdout: true) - echo "Script Output: ${SCRIPT_OUTPUT}" + def SCRIPT_OUTPUT1 = sh (script: 'sudo bash ./jenkins/buildFrontend.sh ${BRANCH_NAME}',returnStdout: true) + echo "Script Output: ${SCRIPT_OUTPUT1}" } } } @@ -21,7 +21,10 @@ pipeline { AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') } steps { - sh 'sudo bash ./jenkins/deployBackend.sh' + script{ + def SCRIPT_OUTPUT2 = sh (script: 'sudo bash ./jenkins/deployBackend.sh ${BRANCH_NAME}',returnStdout: true) + echo "Script Output: ${SCRIPT_OUTPUT2}" + } } } stage('Deploy Frontend') { diff --git a/jenkins/deployBackend.sh b/jenkins/deployBackend.sh index e69de29..0bcf0e2 100644 --- a/jenkins/deployBackend.sh +++ b/jenkins/deployBackend.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env sh + +if test "$1" = "edit-jenkinsfile" +then + echo 'Copy backend to OlberryPi' + scp -r /backend/. simco-jenkins@gitea.oliver.boehlk.io:~/simco-dashboard/backend +else + echo "Skipping for non-master branch" +fi -- 2.49.1 From c3b5a94980ec126d656816f6f065586562872a0a Mon Sep 17 00:00:00 2001 From: Hawk Date: Fri, 15 May 2020 23:22:38 +0200 Subject: [PATCH 23/25] added script for copying backendfolder to olberry --- Jenkinsfile | 3 --- jenkins/deployBackend.sh | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b0bab46..fc3caea 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,9 +17,6 @@ pipeline { } } stage('Deploy Backend') { - environment { - AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') - } steps { script{ def SCRIPT_OUTPUT2 = sh (script: 'sudo bash ./jenkins/deployBackend.sh ${BRANCH_NAME}',returnStdout: true) diff --git a/jenkins/deployBackend.sh b/jenkins/deployBackend.sh index 0bcf0e2..bfbc536 100644 --- a/jenkins/deployBackend.sh +++ b/jenkins/deployBackend.sh @@ -2,8 +2,12 @@ if test "$1" = "edit-jenkinsfile" then + echo 'Stop node process' + ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "killall node" + echo 'Remove old backend folder' + ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "rm -r ~/simco-dashboard/backend" echo 'Copy backend to OlberryPi' - scp -r /backend/. simco-jenkins@gitea.oliver.boehlk.io:~/simco-dashboard/backend + scp -i /etc/ssh/simco_key -r backend simco-jenkins@gitea.oliver.boehlk.io:~/simco-dashboard else echo "Skipping for non-master branch" fi -- 2.49.1 From 8caebbc807c51fd4f4b3a46048ce0de2dd4b0148 Mon Sep 17 00:00:00 2001 From: Hawk Date: Fri, 15 May 2020 23:58:21 +0200 Subject: [PATCH 24/25] added deploy frontend script --- Jenkinsfile | 8 ++++---- jenkins/buildFrontend.sh | 2 +- jenkins/deployBackend.sh | 2 ++ jenkins/deployFrontend.sh | 15 +++++++++++++++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fc3caea..6bf25b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,11 +25,11 @@ pipeline { } } stage('Deploy Frontend') { - environment { - AN_ACCESS_KEY = credentials('3885a64d-7d43-42c2-a713-c8600b44842f') - } steps { - sh 'sudo bash ./jenkins/deployFrontend.sh' + script{ + def SCRIPT_OUTPUT2 = sh (script: 'sudo bash ./jenkins/deployFrontend.sh ${BRANCH_NAME}',returnStdout: true) + echo "Script Output: ${SCRIPT_OUTPUT2}" + } } } } diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index cf9bb55..b583746 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -2,7 +2,7 @@ cd ./frontend -if test "$1" = "master" +if test "$1" = "edit-jenkinsfile" then echo 'Install neccessary Packages' yarn install diff --git a/jenkins/deployBackend.sh b/jenkins/deployBackend.sh index bfbc536..248dc33 100644 --- a/jenkins/deployBackend.sh +++ b/jenkins/deployBackend.sh @@ -8,6 +8,8 @@ then ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "rm -r ~/simco-dashboard/backend" echo 'Copy backend to OlberryPi' scp -i /etc/ssh/simco_key -r backend simco-jenkins@gitea.oliver.boehlk.io:~/simco-dashboard + echo 'Yarn install packages' + ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "cd ~/simco-dashboard/backend && yarn install" else echo "Skipping for non-master branch" fi diff --git a/jenkins/deployFrontend.sh b/jenkins/deployFrontend.sh index e69de29..1d7e931 100644 --- a/jenkins/deployFrontend.sh +++ b/jenkins/deployFrontend.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env sh + +if test "$1" = "edit-jenkinsfile" +then + echo 'Remove old frontend folder' + ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "rm -r ~/simco-dashboard/backend/frontend" + echo 'Copy frontend build to OlberryPi' + scp -i /etc/ssh/simco_key -r frontend/build simco-jenkins@gitea.oliver.boehlk.io:~/simco-dashboard/backend + echo 'Rename build folder to frontend' + ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "mv ~/simco-dashboard/backend/build ~/simco-dashboard/backend/frontend" + echo "Start node server" + ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "cd ~/simco-dashboard/backend && yarn run start" & +else + echo "Skipping for non-master branch" +fi -- 2.49.1 From db122f3af8fc650b1ccce5d5684979ff9d848c5d Mon Sep 17 00:00:00 2001 From: Hawk Date: Sat, 16 May 2020 00:08:42 +0200 Subject: [PATCH 25/25] build and deploy only on master --- jenkins/buildFrontend.sh | 2 +- jenkins/deployBackend.sh | 2 +- jenkins/deployFrontend.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/buildFrontend.sh b/jenkins/buildFrontend.sh index b583746..cf9bb55 100644 --- a/jenkins/buildFrontend.sh +++ b/jenkins/buildFrontend.sh @@ -2,7 +2,7 @@ cd ./frontend -if test "$1" = "edit-jenkinsfile" +if test "$1" = "master" then echo 'Install neccessary Packages' yarn install diff --git a/jenkins/deployBackend.sh b/jenkins/deployBackend.sh index 248dc33..236dc61 100644 --- a/jenkins/deployBackend.sh +++ b/jenkins/deployBackend.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -if test "$1" = "edit-jenkinsfile" +if test "$1" = "master" then echo 'Stop node process' ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "killall node" diff --git a/jenkins/deployFrontend.sh b/jenkins/deployFrontend.sh index 1d7e931..db4e1c2 100644 --- a/jenkins/deployFrontend.sh +++ b/jenkins/deployFrontend.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -if test "$1" = "edit-jenkinsfile" +if test "$1" = "master" then echo 'Remove old frontend folder' ssh -i /etc/ssh/simco_key simco-jenkins@gitea.oliver.boehlk.io "rm -r ~/simco-dashboard/backend/frontend" -- 2.49.1