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 @@ @@ -52,8 +52,8 @@
52 <file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true"> 52 <file leaf-file-name="awsdeploy.sh" pinned="false" current-in-tab="true">
53 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh"> 53 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
54 <provider selected="true" editor-type-id="text-editor"> 54 <provider selected="true" editor-type-id="text-editor">
55 - <state relative-caret-position="217">  
56 - <caret line="48" column="58" lean-forward="false" selection-start-line="48" selection-start-column="58" selection-end-line="48" selection-end-column="58" /> 55 + <state relative-caret-position="294">
  56 + <caret line="62" column="12" lean-forward="true" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
57 <folding /> 57 <folding />
58 </state> 58 </state>
59 </provider> 59 </provider>
@@ -659,12 +659,12 @@ @@ -659,12 +659,12 @@
659 <workItem from="1545890694011" duration="11746000" /> 659 <workItem from="1545890694011" duration="11746000" />
660 <workItem from="1545905663805" duration="1370000" /> 660 <workItem from="1545905663805" duration="1370000" />
661 <workItem from="1545965888175" duration="20585000" /> 661 <workItem from="1545965888175" duration="20585000" />
662 - <workItem from="1546047561789" duration="11227000" /> 662 + <workItem from="1546047561789" duration="12172000" />
663 </task> 663 </task>
664 <servers /> 664 <servers />
665 </component> 665 </component>
666 <component name="TimeTrackingManager"> 666 <component name="TimeTrackingManager">
667 - <option name="totallyTimeSpent" value="44928000" /> 667 + <option name="totallyTimeSpent" value="45873000" />
668 </component> 668 </component>
669 <component name="ToolWindowManager"> 669 <component name="ToolWindowManager">
670 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> 670 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
@@ -681,10 +681,10 @@ @@ -681,10 +681,10 @@
681 <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" /> 681 <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" />
682 <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" /> 682 <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" />
683 <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" /> 683 <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" />
684 - <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" /> 684 + <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" />
685 <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" /> 685 <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" />
686 <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" /> 686 <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" />
687 - <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" /> 687 + <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" />
688 <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" /> 688 <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" />
689 <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" /> 689 <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" />
690 <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" /> 690 <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 @@ @@ -1000,8 +1000,8 @@
1000 </entry> 1000 </entry>
1001 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh"> 1001 <entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
1002 <provider selected="true" editor-type-id="text-editor"> 1002 <provider selected="true" editor-type-id="text-editor">
1003 - <state relative-caret-position="217">  
1004 - <caret line="48" column="58" lean-forward="false" selection-start-line="48" selection-start-column="58" selection-end-line="48" selection-end-column="58" /> 1003 + <state relative-caret-position="294">
  1004 + <caret line="62" column="12" lean-forward="true" selection-start-line="62" selection-start-column="12" selection-end-line="62" selection-end-column="12" />
1005 <folding /> 1005 <folding />
1006 </state> 1006 </state>
1007 </provider> 1007 </provider>
@@ -31,7 +31,8 @@ else @@ -31,7 +31,8 @@ else
31 echo "entered new service" 31 echo "entered new service"
32 aws ecs create-service --service-name ${SERVICE_NAME} --desired-count 1 --task-definition ${SERVICE_NAME} --cluster ${CLUSTER} --region ${REGION} 32 aws ecs create-service --service-name ${SERVICE_NAME} --desired-count 1 --task-definition ${SERVICE_NAME} --cluster ${CLUSTER} --region ${REGION}
33 fi 33 fi
34 - 34 +# wait for 20s check
  35 +sleep 20
35 # check service done by events 36 # check service done by events
36 num=1 37 num=1
37 while [ $num -le 60 ] 38 while [ $num -le 60 ]
@@ -55,7 +56,7 @@ do @@ -55,7 +56,7 @@ do
55 EVENTMESSAGENORMAL="(service "${SERVICE_NAME}") has reached a steady state" 56 EVENTMESSAGENORMAL="(service "${SERVICE_NAME}") has reached a steady state"
56 echo "check event result : aws cli is : $EVENTMESSAGE" 57 echo "check event result : aws cli is : $EVENTMESSAGE"
57 echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL" 58 echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL"
58 - if [[ $EVENTMESSAGE =~ $EVENTMESSAGENORMAL ]] ;then 59 + if [[ $EVENTMESSAGE == *$EVENTMESSAGENORMAL* ]] ;then
59 echo "check aws event is succeed" 60 echo "check aws event is succeed"
60 break; 61 break;
61 fi 62 fi