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 @@
<file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
<state relative-caret-position="164">
<caret line="40" column="102" lean-forward="false" selection-start-line="40" selection-start-column="102" selection-end-line="40" selection-end-column="102" />
<folding />
</state>
</provider>
... ... @@ -609,12 +609,12 @@
<updated>1545890692513</updated>
<workItem from="1545890694011" duration="11746000" />
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="9537000" />
<workItem from="1545965888175" duration="9906000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="22653000" />
<option name="totallyTimeSpent" value="23022000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -631,7 +631,7 @@
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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 @@
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="137">
<caret line="23" column="34" lean-forward="true" selection-start-line="23" selection-start-column="34" selection-end-line="23" selection-end-column="34" />
<state relative-caret-position="164">
<caret line="40" column="102" lean-forward="false" selection-start-line="40" selection-start-column="102" selection-end-line="40" selection-end-column="102" />
<folding />
</state>
</provider>
... ...
... ... @@ -23,6 +23,7 @@ do
let waitnum=waitnum+1
echo "print the cluster info "
/usr/local/bin/kubectl get pods |grep $serviceName
sleep 5
done
## check service is done
num=1
... ... @@ -36,8 +37,8 @@ do
let num=num+1
echo "print the cluster info "
/usr/local/bin/kubectl get pods |grep $serviceName
newrunning=`/usr/local/bin/kubectl get pods |grep $serviceName |awk '$3!="Running"' |wc -l`
newredy=`/usr/local/bin/kubectl get pods |grep $serviceName |awk '$2!="1/1" || $2!="2/2"' |wc -l`
newrunning=${/usr/local/bin/kubectl get pods |grep $serviceName |awk '$3!="Running"' |wc -l}
newredy=${/usr/local/bin/kubectl get pods |grep $serviceName |awk '$2!="1/1" || $2!="2/2"' |wc -l}
if [ "$newrunning" == 0 && "$newredy" == 0 ];then
echo "end with the cluster check the publish is ok"
break;
... ...