Bladeren bron

Merge branch 'feature/jenkins_release' into 'develop'

Merge of feature/jenkins_release to develop

See merge request o2oa/o2oa!282
胡起 5 jaren geleden
bovenliggende
commit
4fe18b13cd
1 gewijzigde bestanden met toevoegingen van 3 en 6 verwijderingen
  1. 3 6
      Jenkinsfile_release

+ 3 - 6
Jenkinsfile_release

@@ -16,7 +16,7 @@ pipeline {
         }
         }
         stage('dependency') {
         stage('dependency') {
             steps {
             steps {
-                sh 'npm run preperation:linux'
+                sh 'npm run preperation:win'
             }
             }
         }
         }
         stage('build') {
         stage('build') {
@@ -36,15 +36,12 @@ pipeline {
         }
         }
         stage('deploy') {
         stage('deploy') {
             steps {
             steps {
-                sh 'npm run deploy:linux'
-                sh 'chmod 777 -R target/o2server/jvm'
-                sh 'chmod 777 -R target/o2server/commons'
-                sh 'chmod 777 target/o2server/*.sh'
+                sh 'npm run deploy:win'
             }
             }
         }
         }
         stage('run') {
         stage('run') {
             steps {
             steps {
-                sh 'JENKINS_NODE_COOKIE=dontKillMe nohup target/o2server/start_linux.sh > nohup.out &'
+                sh 'JENKINS_NODE_COOKIE=dontKillMe start /min target/o2server/start_windows.bat>>output.txt'
             }
             }
         }
         }
     }
     }