yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 8d50e5539fad0fa99468c799e2e0ab1cdca7fca1 1 parent 165711a1

docker

Inline Side-by-side
Showing 2 changed files with 10 additions and 9 deletions
@@ -52,8 +52,8 @@ @@ -52,8 +52,8 @@
52 <file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true"> 52 <file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true">
53 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh"> 53 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
54 <provider selected="true" editor-type-id="text-editor"> 54 <provider selected="true" editor-type-id="text-editor">
55 - <state relative-caret-position="137">  
56 - <caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" /> 55 + <state relative-caret-position="164">
  56 + <caret line="40" column="102" lean-forward="false" selection-start-line="40" selection-start-column="102" selection-end-line="40" selection-end-column="102" />
57 <folding /> 57 <folding />
58 </state> 58 </state>
59 </provider> 59 </provider>
@@ -609,12 +609,12 @@ @@ -609,12 +609,12 @@
609 <updated>1545890692513</updated> 609 <updated>1545890692513</updated>
610 <workItem from="1545890694011" duration="11746000" /> 610 <workItem from="1545890694011" duration="11746000" />
611 <workItem from="1545905663805" duration="1370000" /> 611 <workItem from="1545905663805" duration="1370000" />
612 - <workItem from="1545965888175" duration="9537000" /> 612 + <workItem from="1545965888175" duration="9906000" />
613 </task> 613 </task>
614 <servers /> 614 <servers />
615 </component> 615 </component>
616 <component name="TimeTrackingManager"> 616 <component name="TimeTrackingManager">
617 - <option name="totallyTimeSpent" value="22653000" /> 617 + <option name="totallyTimeSpent" value="23022000" />
618 </component> 618 </component>
619 <component name="ToolWindowManager"> 619 <component name="ToolWindowManager">
620 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 620 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -631,7 +631,7 @@ @@ -631,7 +631,7 @@
631 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 631 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
632 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 632 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
633 <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 633 <window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
634 - <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295082" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 634 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3295082" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
635 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 635 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
636 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 636 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
637 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" /> 637 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
@@ -797,8 +797,8 @@ @@ -797,8 +797,8 @@
797 </entry> 797 </entry>
798 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh"> 798 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
799 <provider selected="true" editor-type-id="text-editor"> 799 <provider selected="true" editor-type-id="text-editor">
800 - <state relative-caret-position="137">  
801 - <caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" /> 800 + <state relative-caret-position="164">
  801 + <caret line="40" column="102" lean-forward="false" selection-start-line="40" selection-start-column="102" selection-end-line="40" selection-end-column="102" />
802 <folding /> 802 <folding />
803 </state> 803 </state>
804 </provider> 804 </provider>
@@ -23,6 +23,7 @@ do @@ -23,6 +23,7 @@ do
23 let waitnum=waitnum+1 23 let waitnum=waitnum+1
24 echo "print the cluster info " 24 echo "print the cluster info "
25 /usr/local/bin/kubectl get pods |grep $serviceName 25 /usr/local/bin/kubectl get pods |grep $serviceName
  26 + sleep 5
26 done 27 done
27 ## check service is done 28 ## check service is done
28 num=1 29 num=1
@@ -36,8 +37,8 @@ do @@ -36,8 +37,8 @@ do
36 let num=num+1 37 let num=num+1
37 echo "print the cluster info " 38 echo "print the cluster info "
38 /usr/local/bin/kubectl get pods |grep $serviceName 39 /usr/local/bin/kubectl get pods |grep $serviceName
39 - newrunning=`/usr/local/bin/kubectl get pods |grep $serviceName |awk '$3!="Running"' |wc -l`  
40 - newredy=`/usr/local/bin/kubectl get pods |grep $serviceName |awk '$2!="1/1" || $2!="2/2"' |wc -l` 40 + newrunning=${/usr/local/bin/kubectl get pods |grep $serviceName |awk '$3!="Running"' |wc -l}
  41 + newredy=${/usr/local/bin/kubectl get pods |grep $serviceName |awk '$2!="1/1" || $2!="2/2"' |wc -l}
41 if [ "$newrunning" == 0 && "$newredy" == 0 ];then 42 if [ "$newrunning" == 0 && "$newredy" == 0 ];then
42 echo "end with the cluster check the publish is ok" 43 echo "end with the cluster check the publish is ok"
43 break; 44 break;