yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 51c23047f121bffa8daed9199e42cdbd8ac89fb6 1 parent 8df21aa0

deploy

Inline Side-by-side
Showing 2 changed files with 7 additions and 6 deletions
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
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="294"> 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" /> 56 + <caret line="59" column="51" lean-forward="false" selection-start-line="59" selection-start-column="51" selection-end-line="59" selection-end-column="51" />
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="12172000" /> 662 + <workItem from="1546047561789" duration="12964000" />
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="45873000" /> 667 + <option name="totallyTimeSpent" value="46665000" />
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" />
@@ -724,7 +724,7 @@ @@ -724,7 +724,7 @@
724 <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" /> 724 <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" />
725 <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" /> 725 <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" />
726 <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" /> 726 <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" />
727 - <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" /> 727 + <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" />
728 <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" /> 728 <window_info id="Find" 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="4" side_tool="false" content_ui="tabs" />
729 <window_info id="Theme Preview" 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="5" side_tool="false" content_ui="tabs" /> 729 <window_info id="Theme Preview" 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="5" side_tool="false" content_ui="tabs" />
730 <window_info id="Favorites" 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="4" side_tool="true" content_ui="tabs" /> 730 <window_info id="Favorites" 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="4" side_tool="true" content_ui="tabs" />
@@ -1001,7 +1001,7 @@ @@ -1001,7 +1001,7 @@
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="294"> 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" /> 1004 + <caret line="59" column="51" lean-forward="false" selection-start-line="59" selection-start-column="51" selection-end-line="59" selection-end-column="51" />
1005 <folding /> 1005 <folding />
1006 </state> 1006 </state>
1007 </provider> 1007 </provider>
@@ -56,7 +56,8 @@ do @@ -56,7 +56,8 @@ do
56 EVENTMESSAGENORMAL="(service "${SERVICE_NAME}") has reached a steady state" 56 EVENTMESSAGENORMAL="(service "${SERVICE_NAME}") has reached a steady state"
57 echo "check event result : aws cli is : $EVENTMESSAGE" 57 echo "check event result : aws cli is : $EVENTMESSAGE"
58 echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL" 58 echo "check event result : EVENTMESSAGENORMAL cli is : $EVENTMESSAGENORMAL"
59 - if [[ $EVENTMESSAGE == *$EVENTMESSAGENORMAL* ]] ;then 59 + isbollean=`$EVENTMESSAGE == *$EVENTMESSAGENORMAL*`
  60 + if [[ $EVENTMESSAGE == *$EVENTMESSAGENORMAL* ]];then
60 echo "check aws event is succeed" 61 echo "check aws event is succeed"
61 break; 62 break;
62 fi 63 fi