yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit a17595d61dd3ed6f84561f3089c7eabe7c14f6b5 1 parent 9f8dc372

docker

Inline Side-by-side
Showing 2 changed files with 8 additions and 8 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="108">  
56 - <caret line="25" column="20" lean-forward="false" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" /> 55 + <state relative-caret-position="-52">
  56 + <caret line="28" column="6" lean-forward="false" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
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="9028000" /> 612 + <workItem from="1545965888175" duration="9257000" />
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="22144000" /> 617 + <option name="totallyTimeSpent" value="22373000" />
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="108">  
801 - <caret line="25" column="20" lean-forward="false" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="20" /> 800 + <state relative-caret-position="-52">
  801 + <caret line="28" column="6" lean-forward="false" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
802 <folding /> 802 <folding />
803 </state> 803 </state>
804 </provider> 804 </provider>
@@ -26,7 +26,7 @@ do @@ -26,7 +26,7 @@ do
26 if [ "$num" == 60 ];then 26 if [ "$num" == 60 ];then
27 echo "over the check number ,the check number is :$num " 27 echo "over the check number ,the check number is :$num "
28 exit 1 28 exit 1
29 - if 29 + fi
30 let num=num+1 30 let num=num+1
31 echo "print the cluster info " 31 echo "print the cluster info "
32 /usr/local/bin/kubectl get pods |grep $serviceName 32 /usr/local/bin/kubectl get pods |grep $serviceName