From cfc2f4c9e87e0c08bda30bf1fcc43aed29edfcc3 Mon Sep 17 00:00:00 2001 From: medcl Date: Fri, 25 Mar 2022 16:21:23 +0800 Subject: [PATCH 1/4] update jenkins, fix web not delete issue --- Jenkinsfile | 1 + Jenkinsfile-docker | 1 + 2 files changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 3d7138ab..977ed2ae 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,6 +18,7 @@ pipeline { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web' + sh 'true||cd /home/jenkins/go/src/infini.sh/console/ && mv web /dev/null' sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index d544ecae..08e749ee 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -22,6 +22,7 @@ pipeline { sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web' + sh 'true||cd /home/jenkins/go/src/infini.sh/console/ && mv web /dev/null' sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' From 4e36f259123b51c3994ba54ea9d128e814b7177f Mon Sep 17 00:00:00 2001 From: medcl Date: Fri, 25 Mar 2022 16:24:51 +0800 Subject: [PATCH 2/4] update jenkins file --- Jenkinsfile | 2 +- Jenkinsfile-docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 977ed2ae..b9bfd915 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,7 @@ pipeline { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web' - sh 'true||cd /home/jenkins/go/src/infini.sh/console/ && mv web /dev/null' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| mv web /dev/null' sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 08e749ee..97c2744e 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -22,7 +22,7 @@ pipeline { sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web' - sh 'true||cd /home/jenkins/go/src/infini.sh/console/ && mv web /dev/null' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| mv web /dev/null' sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' From b30ed538d347cf4f25f35e0dbaf6c7020d19adf0 Mon Sep 17 00:00:00 2001 From: medcl Date: Fri, 25 Mar 2022 16:27:29 +0800 Subject: [PATCH 3/4] safety delete web --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b9bfd915..fc2ef3e0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,8 +17,7 @@ pipeline { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| mv web /dev/null' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| rm -rif web' sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' From 1f393ac842d7b4ceb124fdfacb36e496532a4c26 Mon Sep 17 00:00:00 2001 From: medcl Date: Wed, 30 Mar 2022 12:15:22 +0800 Subject: [PATCH 4/4] update jenkins file --- Jenkinsfile | 4 +++- Jenkinsfile-docker | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fc2ef3e0..30824820 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,7 +18,9 @@ pipeline { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| rm -rif web' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true || git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git pull origin master' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git stash' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build-linux' diff --git a/Jenkinsfile-docker b/Jenkinsfile-docker index 97c2744e..54293423 100644 --- a/Jenkinsfile-docker +++ b/Jenkinsfile-docker @@ -21,9 +21,10 @@ pipeline { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| mv web /dev/null' - sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true|| rm -rif web' + sh 'cd /home/jenkins/go/src/infini.sh/console/ && true || git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git pull origin master' + sh 'cd /home/jenkins/go/src/infini.sh/console/web && git stash' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install' sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build' sh 'cd /home/jenkins/go/src/infini.sh/console && git pull origin master && make config build && chmod a+x bin/console'