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 @@
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="40" column="66" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="66" />
<caret line="40" column="14" lean-forward="false" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding />
</state>
</provider>
... ... @@ -609,12 +609,12 @@
<updated>1545890692513</updated>
<workItem from="1545890694011" duration="11746000" />
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="10021000" />
<workItem from="1545965888175" duration="10362000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="23137000" />
<option name="totallyTimeSpent" value="23478000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -798,7 +798,7 @@
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="40" column="66" lean-forward="false" selection-start-line="40" selection-start-column="66" selection-end-line="40" selection-end-column="66" />
<caret line="40" column="14" lean-forward="false" selection-start-line="40" selection-start-column="14" selection-end-line="40" selection-end-column="14" />
<folding />
</state>
</provider>
... ...
... ... @@ -37,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;
... ...