yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 1e3dcb23a9c357ead0cba42837663390db26ce1a 1 parent 2d0f9585

deploy

Inline Side-by-side
Showing 2 changed files with 8 additions and 7 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="189">  
56 - <caret line="49" column="15" lean-forward="true" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" /> 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" />
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="10982000" /> 662 + <workItem from="1546047561789" duration="11227000" />
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="44683000" /> 667 + <option name="totallyTimeSpent" value="44928000" />
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" />
@@ -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="189">  
1004 - <caret line="49" column="15" lean-forward="true" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" /> 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" />
1005 <folding /> 1005 <folding />
1006 </state> 1006 </state>
1007 </provider> 1007 </provider>
@@ -46,12 +46,13 @@ do @@ -46,12 +46,13 @@ do
46 46
47 SERVICEDEPLOYMENTPENDING=`aws ecs describe-services --cluster ${CLUSTER} --services ${SERVICE_NAME} |jq .services[].deployments[0].pendingCount` 47 SERVICEDEPLOYMENTPENDING=`aws ecs describe-services --cluster ${CLUSTER} --services ${SERVICE_NAME} |jq .services[].deployments[0].pendingCount`
48 if [ "$SERVICEDEPLOYMENTPENDING" != 0 ] ;then 48 if [ "$SERVICEDEPLOYMENTPENDING" != 0 ] ;then
  49 + echo "the pedding count is $SERVICEDEPLOYMENTPENDING"
49 sleep 10 50 sleep 10
50 continue; 51 continue;
51 fi 52 fi
52 53
53 EVENTMESSAGE=`aws ecs describe-services --cluster ${CLUSTER} --services ${SERVICE_NAME} |jq .services[].events[0].message` 54 EVENTMESSAGE=`aws ecs describe-services --cluster ${CLUSTER} --services ${SERVICE_NAME} |jq .services[].events[0].message`
54 - EVENTMESSAGENORMAL=(service "${SERVICE_NAME}") has reached a steady state 55 + EVENTMESSAGENORMAL="(service "${SERVICE_NAME}") has reached a steady state"
55 echo "check event result : aws cli is : $EVENTMESSAGE" 56 echo "check event result : aws cli is : $EVENTMESSAGE"
56 echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL" 57 echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL"
57 if [[ $EVENTMESSAGE =~ $EVENTMESSAGENORMAL ]] ;then 58 if [[ $EVENTMESSAGE =~ $EVENTMESSAGENORMAL ]] ;then