yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 8df21aa0d6bf75b05424381ec2b9debbc944192d 1 parent 1e3dcb23

deploy

Inline Side-by-side
Showing 2 changed files with 11 additions and 10 deletions
... ... @@ -52,8 +52,8 @@
<file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="48" column="58" lean-forward="false" selection-start-line="48" selection-start-column="58" selection-end-line="48" selection-end-column="58" />
<state relative-caret-position="294">
<caret line="62" column="12" lean-forward="true" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
<folding />
</state>
</provider>
... ... @@ -659,12 +659,12 @@
<workItem from="1545890694011" duration="11746000" />
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="20585000" />
<workItem from="1546047561789" duration="11227000" />
<workItem from="1546047561789" duration="12172000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44928000" />
<option name="totallyTimeSpent" value="45873000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -681,10 +681,10 @@
<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="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="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.2590164" 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.2590164" 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="true" show_stripe_button="true" weight="0.24962178" sideWeight="0.5" order="6" side_tool="false" content_ui="combo" />
<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" />
<window_info id="Database" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
... ... @@ -1000,8 +1000,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="48" column="58" lean-forward="false" selection-start-line="48" selection-start-column="58" selection-end-line="48" selection-end-column="58" />
<state relative-caret-position="294">
<caret line="62" column="12" lean-forward="true" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
<folding />
</state>
</provider>
... ...
... ... @@ -31,7 +31,8 @@ else
echo "entered new service"
aws ecs create-service --service-name ${SERVICE_NAME} --desired-count 1 --task-definition ${SERVICE_NAME} --cluster ${CLUSTER} --region ${REGION}
fi
# wait for 20s check
sleep 20
# check service done by events
num=1
while [ $num -le 60 ]
... ... @@ -55,7 +56,7 @@ do
EVENTMESSAGENORMAL="(service "${SERVICE_NAME}") has reached a steady state"
echo "check event result : aws cli is : $EVENTMESSAGE"
echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL"
if [[ $EVENTMESSAGE =~ $EVENTMESSAGENORMAL ]] ;then
if [[ $EVENTMESSAGE == *$EVENTMESSAGENORMAL* ]] ;then
echo "check aws event is succeed"
break;
fi
... ...