yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 0a5fc4da72251486e9786dc69745e8e024c208cf 1 parent c9cf26ff

docker qcloud deploy

Inline Side-by-side
Showing 2 changed files with 17 additions and 17 deletions
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment=""> 4 <list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment="">
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
7 </list> 7 </list>
8 <ignored path="$PROJECT_DIR$/out/" /> 8 <ignored path="$PROJECT_DIR$/out/" />
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -29,21 +29,21 @@ @@ -29,21 +29,21 @@
29 </provider> 29 </provider>
30 </entry> 30 </entry>
31 </file> 31 </file>
32 - <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="false"> 32 + <file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true">
33 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile"> 33 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
34 <provider selected="true" editor-type-id="text-editor"> 34 <provider selected="true" editor-type-id="text-editor">
35 - <state relative-caret-position="527">  
36 - <caret line="66" column="13" lean-forward="true" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" /> 35 + <state relative-caret-position="257">
  36 + <caret line="50" column="17" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="17" />
37 <folding /> 37 <folding />
38 </state> 38 </state>
39 </provider> 39 </provider>
40 </entry> 40 </entry>
41 </file> 41 </file>
42 - <file leaf-file-name="qcloudDeploy.py" pinned="false" current-in-tab="true"> 42 + <file leaf-file-name="qcloudDeploy.py" pinned="false" current-in-tab="false">
43 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py"> 43 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py">
44 <provider selected="true" editor-type-id="text-editor"> 44 <provider selected="true" editor-type-id="text-editor">
45 - <state relative-caret-position="81">  
46 - <caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" /> 45 + <state relative-caret-position="-1863">
  46 + <caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
47 <folding /> 47 <folding />
48 </state> 48 </state>
49 </provider> 49 </provider>
@@ -100,8 +100,8 @@ @@ -100,8 +100,8 @@
100 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api.json" /> 100 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api.json" />
101 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" /> 101 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" />
102 <option value="$PROJECT_DIR$/readme.md" /> 102 <option value="$PROJECT_DIR$/readme.md" />
103 - <option value="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />  
104 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" /> 103 <option value="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" />
  104 + <option value="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
105 </list> 105 </list>
106 </option> 106 </option>
107 </component> 107 </component>
@@ -600,12 +600,12 @@ @@ -600,12 +600,12 @@
600 <workItem from="1545905663805" duration="1370000" /> 600 <workItem from="1545905663805" duration="1370000" />
601 <workItem from="1545965888175" duration="20585000" /> 601 <workItem from="1545965888175" duration="20585000" />
602 <workItem from="1546047561789" duration="16674000" /> 602 <workItem from="1546047561789" duration="16674000" />
603 - <workItem from="1546394046618" duration="4373000" /> 603 + <workItem from="1546394046618" duration="4527000" />
604 </task> 604 </task>
605 <servers /> 605 <servers />
606 </component> 606 </component>
607 <component name="TimeTrackingManager"> 607 <component name="TimeTrackingManager">
608 - <option name="totallyTimeSpent" value="54748000" /> 608 + <option name="totallyTimeSpent" value="54902000" />
609 </component> 609 </component>
610 <component name="ToolWindowManager"> 610 <component name="ToolWindowManager">
611 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 611 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -924,18 +924,18 @@ @@ -924,18 +924,18 @@
924 </state> 924 </state>
925 </provider> 925 </provider>
926 </entry> 926 </entry>
927 - <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile"> 927 + <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py">
928 <provider selected="true" editor-type-id="text-editor"> 928 <provider selected="true" editor-type-id="text-editor">
929 - <state relative-caret-position="527">  
930 - <caret line="66" column="13" lean-forward="true" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" /> 929 + <state relative-caret-position="-1863">
  930 + <caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
931 <folding /> 931 <folding />
932 </state> 932 </state>
933 </provider> 933 </provider>
934 </entry> 934 </entry>
935 - <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py"> 935 + <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
936 <provider selected="true" editor-type-id="text-editor"> 936 <provider selected="true" editor-type-id="text-editor">
937 - <state relative-caret-position="81">  
938 - <caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" /> 937 + <state relative-caret-position="257">
  938 + <caret line="50" column="17" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="17" />
939 <folding /> 939 <folding />
940 </state> 940 </state>
941 </provider> 941 </provider>
@@ -44,7 +44,7 @@ pipeline { @@ -44,7 +44,7 @@ pipeline {
44 if(params.deployEnv=='qcloud' || params.deployEnv=='all'){ 44 if(params.deployEnv=='qcloud' || params.deployEnv=='all'){
45 //切换kubectl的认证 45 //切换kubectl的认证
46 def pyworkdir="${env.WORKSPACE}/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" 46 def pyworkdir="${env.WORKSPACE}/Docker-Image-Deplopy/qcloud/qcloudDeploy.py"
47 - sh "sh ${pyworkdir} ${params.clusterId} ${params.serviceName} ${params.containerName} ${params.imageInfo}" 47 + sh "python ${pyworkdir} ${params.clusterId} ${params.serviceName} ${params.containerName} ${params.imageInfo}"
48 }else { 48 }else {
49 println "qcloud this no need deploy" 49 println "qcloud this no need deploy"
50 } 50 }