Showing
2 changed files
with
8 additions
and
7 deletions
@@ -23,7 +23,7 @@ | @@ -23,7 +23,7 @@ | ||
23 | <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile"> | 23 | <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile"> |
24 | <provider selected="true" editor-type-id="text-editor"> | 24 | <provider selected="true" editor-type-id="text-editor"> |
25 | <state relative-caret-position="243"> | 25 | <state relative-caret-position="243"> |
26 | - <caret line="9" column="61" lean-forward="true" selection-start-line="9" selection-start-column="61" selection-end-line="9" selection-end-column="61" /> | 26 | + <caret line="108" column="24" lean-forward="false" selection-start-line="108" selection-start-column="24" selection-end-line="108" selection-end-column="24" /> |
27 | <folding /> | 27 | <folding /> |
28 | </state> | 28 | </state> |
29 | </provider> | 29 | </provider> |
@@ -535,12 +535,12 @@ | @@ -535,12 +535,12 @@ | ||
535 | <option name="number" value="Default" /> | 535 | <option name="number" value="Default" /> |
536 | <option name="presentableId" value="Default" /> | 536 | <option name="presentableId" value="Default" /> |
537 | <updated>1545890692513</updated> | 537 | <updated>1545890692513</updated> |
538 | - <workItem from="1545890694011" duration="3501000" /> | 538 | + <workItem from="1545890694011" duration="4399000" /> |
539 | </task> | 539 | </task> |
540 | <servers /> | 540 | <servers /> |
541 | </component> | 541 | </component> |
542 | <component name="TimeTrackingManager"> | 542 | <component name="TimeTrackingManager"> |
543 | - <option name="totallyTimeSpent" value="3501000" /> | 543 | + <option name="totallyTimeSpent" value="4399000" /> |
544 | </component> | 544 | </component> |
545 | <component name="ToolWindowManager"> | 545 | <component name="ToolWindowManager"> |
546 | <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> | 546 | <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> |
@@ -636,7 +636,7 @@ | @@ -636,7 +636,7 @@ | ||
636 | <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile"> | 636 | <entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile"> |
637 | <provider selected="true" editor-type-id="text-editor"> | 637 | <provider selected="true" editor-type-id="text-editor"> |
638 | <state relative-caret-position="243"> | 638 | <state relative-caret-position="243"> |
639 | - <caret line="9" column="61" lean-forward="true" selection-start-line="9" selection-start-column="61" selection-end-line="9" selection-end-column="61" /> | 639 | + <caret line="108" column="24" lean-forward="false" selection-start-line="108" selection-start-column="24" selection-end-line="108" selection-end-column="24" /> |
640 | <folding /> | 640 | <folding /> |
641 | </state> | 641 | </state> |
642 | </provider> | 642 | </provider> |
@@ -23,7 +23,7 @@ pipeline { | @@ -23,7 +23,7 @@ pipeline { | ||
23 | 23 | ||
24 | options { | 24 | options { |
25 | //保持构建的最大个数 | 25 | //保持构建的最大个数 |
26 | - buildDiscarder(logRotator(numToKeepStr: '50')) | 26 | + buildDiscarder(logRotator(numToKeepStr: '2')) |
27 | } | 27 | } |
28 | 28 | ||
29 | stages { | 29 | stages { |
@@ -78,8 +78,8 @@ pipeline { | @@ -78,8 +78,8 @@ pipeline { | ||
78 | def repalceDir = "${workdir}/public/dist" | 78 | def repalceDir = "${workdir}/public/dist" |
79 | println repalceDir | 79 | println repalceDir |
80 | sh "sed -i 's?${olddir}?${repalceDir}?g' ${env.WORKSPACE}/Docker-Node-Build/LocalUploadConfig" | 80 | sh "sed -i 's?${olddir}?${repalceDir}?g' ${env.WORKSPACE}/Docker-Node-Build/LocalUploadConfig" |
81 | - //sh "/home/soft/qshell qupload 3 ${env.WORKSPACE}/Docker-Node-Build/LocalUploadConfig" | ||
82 | - //sh "cp -r ${repalceDir} /nfs-ops/Data/app/node-ci/data" | 81 | + sh "/home/soft/qshell qupload 3 ${env.WORKSPACE}/Docker-Node-Build/LocalUploadConfig" |
82 | + sh "cp -r ${repalceDir} /nfs-ops/Data/app/node-ci/data" | ||
83 | }else { | 83 | }else { |
84 | println "params.isNeedCdn is not yes,no upload" | 84 | println "params.isNeedCdn is not yes,no upload" |
85 | } | 85 | } |
@@ -106,6 +106,7 @@ pipeline { | @@ -106,6 +106,7 @@ pipeline { | ||
106 | if(check_push_aws_images(params.projectName)){ | 106 | if(check_push_aws_images(params.projectName)){ |
107 | def qcloudimage = "${env.QCLOUD_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}" | 107 | def qcloudimage = "${env.QCLOUD_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}" |
108 | def awsimage = "${env.AWS_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}" | 108 | def awsimage = "${env.AWS_IMAGE}/${params.imageSource}/${params.deployName}:${params.imageVersion}" |
109 | + | ||
109 | sh "docker tag ${qcloudimage} ${awsimage} " | 110 | sh "docker tag ${qcloudimage} ${awsimage} " |
110 | sh "docker push ${awsimage}" | 111 | sh "docker push ${awsimage}" |
111 | echo "upload images to aws : ${params.projectName}" | 112 | echo "upload images to aws : ${params.projectName}" |
-
Please register or login to post a comment