修改打包脚本

Jenkinsfile

@@ -26,16 +26,42 @@ pipeline {
             }
         }
         stage('deploy') {
-            steps {
-                sh 'npm run deploy:linux'
-                sh 'chmod 777 target/o2server/*.sh'
+            parallel {
+                stage('deploy sotre') {
+                    steps {
+                        sh 'npm run deploy:sotre'
+                    }
+                }
+                stage('deploy commons') {
+                    steps {
+                        sh 'npm run deploy:commons'
+                    }
+                }
+                stage('deploy jvm') {
+                    steps {
+                        sh 'npm run deploy:jvm'
+                    }
+                }
+                stage('deploy config') {
+                    steps {
+                        sh 'npm run deploy:config'
+                    }
+                }
+                stage('deploy local') {
+                    steps {
+                        sh 'npm run deploy:local'
+                    }
+                }
+                stage('deploy script') {
+                    steps {
+                        sh 'deploy_script:linux'
+                        sh 'chmod 777 target/o2server/*.sh'
+                    }
+                }
             }
         }
         stage('run') {
             steps {
-                //sh 'nohup target/o2server/start_linux.sh &'
-                //sh 'cd target/o2server'
-                sh 'pwd'
                 sh 'JENKINS_NODE_COOKIE=dontKillMe nohup target/o2server/start_linux.sh > nohup.out &'
             }
         }

gulpfile.js

@@ -293,14 +293,14 @@ function deploy_server_store(){
     });
 
     var source = "o2server/store/**/*";
-    var dest = "target/o2server/store/"
+    var dest = "target/o2server/store/";
     return gulp.src(source)
         .pipe(progressStream)
         .pipe(gulp.dest(dest))
         .pipe(gutil.noop());
 }
 function deploy_server_commons(){
-    var path = "o2server/commons/"
+    var path = "o2server/commons/";
     var fileCount = getFileCount(path);
 
     var pb = new ProgressBar('total: '+fileCount, 50);
@@ -316,14 +316,14 @@ function deploy_server_commons(){
     });
 
     var source = "o2server/commons/**/*";
-    var dest = "target/o2server/commons/"
+    var dest = "target/o2server/commons/";
     return gulp.src(source)
         .pipe(progressStream)
         .pipe(gulp.dest(dest))
         .pipe(gutil.noop());
 }
 function deploy_server_jvm(){
-    var path = "o2server/jvm/"
+    var path = "o2server/jvm/";
     var fileCount = getFileCount(path);
 
     var pb = new ProgressBar('total: '+fileCount, 50);
@@ -339,14 +339,14 @@ function deploy_server_jvm(){
     });
 
     var source = "o2server/jvm/**/*";
-    var dest = "target/o2server/jvm/"
+    var dest = "target/o2server/jvm/";
     return gulp.src(source)
         .pipe(progressStream)
         .pipe(gulp.dest(dest))
         .pipe(gutil.noop());
 }
 function deploy_server_config(){
-    var path = "o2server/configSample/"
+    var path = "o2server/configSample/";
     var fileCount = getFileCount(path);
 
     var pb = new ProgressBar('total: '+fileCount, 50);
@@ -362,14 +362,14 @@ function deploy_server_config(){
     });
 
     var source = "o2server/configSample/**/*";
-    var dest = "target/o2server/configSample/"
+    var dest = "target/o2server/configSample/";
     return gulp.src(source)
         .pipe(progressStream)
         .pipe(gulp.dest(dest))
         .pipe(gutil.noop());
 }
 function deploy_server_local(){
-    var path = "o2server/localSample/"
+    var path = "o2server/localSample/";
     var fileCount = getFileCount(path);
 
     var pb = new ProgressBar('total: '+fileCount, 50);
@@ -385,19 +385,27 @@ function deploy_server_local(){
     });
 
     var source = "o2server/localSample/**/*";
-    var dest = "target/o2server/localSample/"
+    var dest = "target/o2server/localSample/";
     return gulp.src(source)
         .pipe(progressStream)
         .pipe(gulp.dest(dest))
         .pipe(gutil.noop());
 }
 function deploy_server_script(){
-    var dest = "target/o2server/"
+    var dest = "target/o2server/";
     return gulp.src(scriptSource)
         .pipe(gulp.dest(dest))
         .pipe(gutil.noop());
 }
 
 
-exports.preperation = gulp.series(download_commons_and_jvm, decompress_commons_and_jvm,);
-exports.deploy = gulp.series(deploy_web, deploy_server_store, deploy_server_commons, deploy_server_jvm, deploy_server_config, deploy_server_local, deploy_server_script);
+exports.preperation = gulp.series(download_commons_and_jvm, decompress_commons_and_jvm);
+//exports.deploy_web = deploy_web;
+exports.deploy_server_store = deploy_server_store;
+exports.deploy_server_commons = deploy_server_commons;
+exports.deploy_server_jvm = deploy_server_jvm;
+exports.deploy_server_config = deploy_server_config;
+exports.deploy_server_local = deploy_server_local;
+exports.deploy_server_script = deploy_server_script;
+exports.deploy_server = gulp.series(deploy_server_store, deploy_server_commons, deploy_server_jvm, deploy_server_config, deploy_server_local, deploy_server_script);
+exports.deploy = gulp.series(deploy_server_store, deploy_server_commons, deploy_server_jvm, deploy_server_config, deploy_server_local, deploy_server_script);

o2server/gulpfile.js

@@ -111,7 +111,7 @@ var apps = [
 ];
 
 var sourcePrefix = '../o2web/';
-var destDir = 'servers/webServer/';
+var destDir = '../target/o2server/servers/webServer/';
 
 var uploadOptions = {
     'location': 'E:/o2server/servers/webServer/',

package.json

@@ -26,6 +26,19 @@
     "deploy:neokylin": "gulp deploy --e neokylin",
     "deploy:rpi": "gulp deploy --e raspberrypi",
 
+    "deploy:sotre": "gulp deploy_server_store",
+    "deploy:commons": "gulp deploy_server_commons",
+    "deploy:jvm": "gulp deploy_server_jvm",
+    "deploy:config": "gulp deploy_server_config",
+    "deploy:local": "gulp deploy_server_local",
+    "deploy_script:win": "gulp deploy_server_script --e windows",
+    "deploy_script:linux": "gulp deploy_server_script --e linux",
+    "deploy_script:aix": "gulp deploy_server_script --e aix",
+    "deploy_script:kylinos": "gulp deploy_server_script --e kylinos",
+    "deploy_script:macos": "gulp deploy_server_script --e macos",
+    "deploy_script:neokylin": "gulp deploy_server_script --e neokylin",
+    "deploy_script:rpi": "gulp deploy_server_script --e raspberrypi",
+
     "typeInfor": "type welcome && echo Your server is build success: target/o2server/",
 
     "build": "npm run preperation && npm run build_parallel && npm run deploy && npm run typeInfor",