diff --git a/.gitignore b/.gitignore index b3156879..f87d9ef5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -ui/**/dist \ No newline at end of file +ui/**/dist +das/**/target \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index d712f593..0e7e8820 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { } steps { dir("$WORKSPACE/ui/dasadmin") { - sh "rsync -av --delete --copy-as=root dist/ root@192.168.109.195:/das/ui/" + sh "sudo rsync -av --delete dist/ root@192.168.109.195:/das/ui/" } } } @@ -53,7 +53,7 @@ pipeline { } steps { dir("$WORKSPACE/das") { - sh 'rsync -av --delete --copy-as=root "$WORKSPACE/ui/dasadmin/dist/" "$WORKSPACE/das/src/main/resources/static"' + sh 'sudo rsync -av --delete --copy-as=root "$WORKSPACE/das/target/" "$WORKSPACE/das/src/main/resources/static"' sh 'mvn -DskipTests -am clean package' } }