yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 8729b31fd4c64a8222bd701cc63dbf0c74b912fc 1 parent 1e5d9d3b

docker

Inline Side-by-side
Showing 2 changed files with 6 additions and 6 deletions
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
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="164"> 55 <state relative-caret-position="164">
56 - <caret line="40" column="66" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="66" /> 56 + <caret line="40" column="14" lean-forward="false" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
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="10021000" /> 612 + <workItem from="1545965888175" duration="10362000" />
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="23137000" /> 617 + <option name="totallyTimeSpent" value="23478000" />
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" />
@@ -798,7 +798,7 @@ @@ -798,7 +798,7 @@
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="164"> 800 <state relative-caret-position="164">
801 - <caret line="40" column="66" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="66" /> 801 + <caret line="40" column="14" lean-forward="false" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
802 <folding /> 802 <folding />
803 </state> 803 </state>
804 </provider> 804 </provider>
@@ -37,8 +37,8 @@ do @@ -37,8 +37,8 @@ do
37 let num=num+1 37 let num=num+1
38 echo "print the cluster info " 38 echo "print the cluster info "
39 /usr/local/bin/kubectl get pods |grep $serviceName 39 /usr/local/bin/kubectl get pods |grep $serviceName
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} 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)
42 if [ "$newrunning" == 0 && "$newredy" == 0 ];then 42 if [ "$newrunning" == 0 && "$newredy" == 0 ];then
43 echo "end with the cluster check the publish is ok" 43 echo "end with the cluster check the publish is ok"
44 break; 44 break;