yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 1bda1a9641024b01f9be8512ad4627fc5ee6bfaf 1 parent 339d580d

docker

Inline Side-by-side
Showing 2 changed files with 16 additions and 9 deletions
... ... @@ -3,6 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -51,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="164">
<caret line="40" column="76" lean-forward="true" selection-start-line="40" selection-start-column="76" selection-end-line="40" selection-end-column="76" />
<state relative-caret-position="243">
<caret line="9" column="21" lean-forward="true" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
<folding />
</state>
</provider>
... ... @@ -608,12 +609,12 @@
<updated>1545890692513</updated>
<workItem from="1545890694011" duration="11746000" />
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="12206000" />
<workItem from="1545965888175" duration="13575000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="25322000" />
<option name="totallyTimeSpent" value="26691000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -630,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="true" 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="false" 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" />
... ... @@ -796,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="164">
<caret line="40" column="76" lean-forward="true" selection-start-line="40" selection-start-column="76" selection-end-line="40" selection-end-column="76" />
<state relative-caret-position="243">
<caret line="9" column="21" lean-forward="true" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
<folding />
</state>
</provider>
... ...
... ... @@ -12,6 +12,12 @@ imageInfo="ccr.ccs.tencentyun.com/$4"
## 切换当前的工作空间
/usr/local/bin/kubectl config use-context $clusterInfo
## 确定切换成功
currentcontext=$(/usr/local/bin/kubectl config current-context)
if [ "$currentcontext" != "$clusterInfo" ];then
echo "change kubectl ca failure,please check result"
exit 1
fi
/usr/local/bin/kubectl get pods
## 更新镜像信息
... ... @@ -23,7 +29,7 @@ do
let waitnum=waitnum+1
echo "print the cluster info "
/usr/local/bin/kubectl get pods |grep $serviceName
## sleep 5
sleep 5
done
## check service is done
num=1
... ... @@ -31,7 +37,7 @@ while [ $num -le 60 ]
do
echo "begin check the service is done ,the check number is :$num "
if [ "$num" == 60 ];then
echo "over the check number ,the check number is :$num "
echo "over 10 min the service is not down please check the service ,the check number is :$num "
exit 1
fi
let num=num+1
... ...