yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 15b41b159383003c4f0ad82f9d1c6252e44da7c4 1 parent ae83f74e

docker qcloud deploy

Inline Side-by-side
Showing 5 changed files with 202 additions and 246 deletions
... ... @@ -2,8 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/test/Jenkinsfile" afterPath="" />
<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/qcloudDeploy.py" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/readme.md" afterPath="$PROJECT_DIR$/readme.md" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -22,38 +25,101 @@
<file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="21" column="5" lean-forward="false" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
<state relative-caret-position="297">
<caret line="31" column="24" lean-forward="true" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="readme.md" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/readme.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="216">
<caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="14">
<caret line="23" column="50" lean-forward="false" selection-start-line="23" selection-start-column="50" selection-end-line="23" selection-end-column="50" />
<state relative-caret-position="270">
<caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="qcloudDeploy.py" pinned="false" current-in-tab="true">
<file leaf-file-name="qcloudDeploy.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="103" column="51" lean-forward="false" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="51" />
<state relative-caret-position="216">
<caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="qcloud.sh" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<file leaf-file-name="yohobuywap-node-template.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuywap-node-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="113">
<caret line="36" column="81" lean-forward="false" selection-start-line="36" selection-start-column="81" selection-end-line="36" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="yoho-ultrain-block-api-template.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
<caret line="6" column="25" lean-forward="true" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="yoho-app-web-template.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-app-web-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ufo-app-web-template.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/ufo-app-web-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<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="-27">
<caret line="50" column="14" lean-forward="true" selection-start-line="50" selection-start-column="14" selection-end-line="50" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jenkins-pipeline.iml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/jenkins-pipeline.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<folding />
</state>
</provider>
... ... @@ -99,8 +165,8 @@
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-app-web.json" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api.json" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh" />
<option value="$PROJECT_DIR$/readme.md" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
<option value="$PROJECT_DIR$/readme.md" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" />
</list>
</option>
... ... @@ -157,6 +223,20 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Docker-Node-Build" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="jenkins-pipeline" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="jenkins-pipeline" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Docker-Image-Deplopy" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
... ... @@ -179,6 +259,24 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="jenkins-pipeline" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="jenkins-pipeline" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="Docker-Image-Deplopy" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="aws" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
</panes>
... ... @@ -600,12 +698,12 @@
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="20585000" />
<workItem from="1546047561789" duration="16674000" />
<workItem from="1546394046618" duration="5097000" />
<workItem from="1546394046618" duration="8049000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="55472000" />
<option name="totallyTimeSpent" value="58424000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -664,8 +762,8 @@
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" 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="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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.43606558" sideWeight="0.5" order="2" 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" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.43606558" sideWeight="0.5" order="2" 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="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" />
<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" />
<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" />
... ... @@ -721,6 +819,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -744,6 +843,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="14" column="49" lean-forward="false" selection-start-line="14" selection-start-column="49" selection-end-line="14" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
... ... @@ -759,6 +859,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
... ... @@ -766,6 +867,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -789,6 +891,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
... ... @@ -796,6 +899,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -819,6 +923,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
... ... @@ -826,13 +931,35 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/jenkins-pipeline.iml">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/deploy.sh" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/ufo-app-web.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-app-web.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template-1.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<caret line="28" column="81" lean-forward="false" selection-start-line="28" selection-start-column="65" selection-end-line="28" selection-end-column="81" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2215">
<caret line="9" column="25" lean-forward="false" selection-start-line="9" selection-start-column="25" selection-end-line="9" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
... ... @@ -840,102 +967,97 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/deploy.sh" />
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/LocalUploadConfig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="19" column="32" lean-forward="false" selection-start-line="19" selection-start-column="32" selection-end-line="19" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/ufo-app-web.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-app-web.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template-1.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api.json" />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/ufo-app-web-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuywap-node-template.json">
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="113">
<caret line="36" column="81" lean-forward="false" selection-start-line="36" selection-start-column="81" selection-end-line="36" selection-end-column="81" />
<state relative-caret-position="297">
<caret line="31" column="24" lean-forward="true" selection-start-line="31" selection-start-column="24" selection-end-line="31" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-app-web-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<entry file="file://$PROJECT_DIR$/readme.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="216">
<caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
<folding />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api-template.json">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="6" column="25" lean-forward="true" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
<state relative-caret-position="270">
<caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuy-node-template.json">
<entry file="file://$PROJECT_DIR$/jenkins-pipeline.iml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="28" column="81" lean-forward="false" selection-start-line="28" selection-start-column="65" selection-end-line="28" selection-end-column="81" />
<caret line="4" column="12" lean-forward="false" selection-start-line="4" selection-start-column="12" selection-end-line="4" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="730">
<caret line="63" column="4" lean-forward="true" selection-start-line="63" selection-start-column="4" selection-end-line="63" selection-end-column="4" />
<state relative-caret-position="216">
<caret line="8" column="15" lean-forward="true" selection-start-line="8" selection-start-column="15" selection-end-line="8" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/readme.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="177">
<caret line="8" column="12" lean-forward="false" selection-start-line="8" selection-start-column="12" selection-end-line="8" selection-end-column="12" />
<folding />
</first_editor>
<second_editor />
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yohobuywap-node-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="113">
<caret line="36" column="81" lean-forward="false" selection-start-line="36" selection-start-column="81" selection-end-line="36" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Node-Build/Jenkinsfile">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-ultrain-block-api-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="21" column="5" lean-forward="false" selection-start-line="21" selection-start-column="5" selection-end-line="21" selection-end-column="5" />
<state relative-caret-position="162">
<caret line="6" column="25" lean-forward="true" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloud.sh">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/yoho-app-web-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="6" column="23" lean-forward="true" selection-start-line="6" selection-start-column="23" selection-end-line="6" selection-end-column="23" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/ufo-app-web-template.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="14">
<caret line="23" column="50" lean-forward="false" selection-start-line="23" selection-start-column="50" selection-end-line="23" selection-end-column="50" />
<state relative-caret-position="324">
<caret line="12" column="9" lean-forward="true" selection-start-line="12" selection-start-column="9" selection-end-line="12" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/aws/awsdeploy.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="103" column="51" lean-forward="false" selection-start-line="103" selection-start-column="0" selection-end-line="103" selection-end-column="51" />
<state relative-caret-position="-27">
<caret line="50" column="14" lean-forward="true" selection-start-line="50" selection-start-column="14" selection-end-line="50" selection-end-column="14" />
<folding />
</state>
</provider>
... ...
#!/bin/bash
echo "para clusterId is : $1"
echo "para serviceName is : $2"
echo "para containerName is : $3"
echo "para imageInfo is : $4"
clusterInfo="system-$1"
serviceName=$2
containerName=$3
imageInfo="ccr.ccs.tencentyun.com/$4"
if [[ "$clusterInfo" != "system-yoho-media" ]] && [[ "$clusterInfo" != "system-yoho-ops" ]] && [[ "$clusterInfo" != "system-yoho-web" ]] && [[ "$clusterInfo" != "system-yoho-web-gray" ]];then
echo "$clusterInfo info is not right,please check the world"
exit 1
fi
## 切换当前的工作空间
/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
## 确定存在这样的服务
makesureservicenum=$(/usr/local/bin/kubectl get svc |grep "$serviceName" |wc -l)
if [ "$makesureservicenum" == 0 ];then
echo "please check the service name there is no service here "
exit 1
fi
## 更新镜像信息
/usr/local/bin/kubectl set image deployment/$serviceName $containerName=$imageInfo
## 等待30s后校验
waitnum=1
while [ $waitnum -le 4 ]
do
let waitnum=waitnum+1
echo "print the cluster info "
/usr/local/bin/kubectl get pods |grep $serviceName
sleep 5
done
## check service is done
num=1
while [ $num -le 60 ]
do
echo "begin check the service is done ,the check number is :$num "
if [ "$num" == 60 ];then
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
echo "print the cluster info "
/usr/local/bin/kubectl get pods |grep $serviceName
newrunning=$(/usr/local/bin/kubectl get pods |grep "$serviceName" |awk '$3!="Running"' |wc -l)
newredy=$(/usr/local/bin/kubectl get pods |grep "$serviceName" |grep -v 2/2|grep -v 1/1 |wc -l)
echo "newrunning is $newrunning ,newredy is $newredy"
if [ "$newrunning" -eq 0 -a "$newredy" -eq 0 ];then
echo "end with the cluster check the publish is ok"
break;
fi
sleep 10
done
... ... @@ -82,7 +82,7 @@ def main(clusterid, servicename, containername, imageversion):
sys.exit(1)
print 'begin check the result clusterid : %s , servicename: %s' % (clusterid, servicename)
count = 0
time.sleep(10)
time.sleep(20)
while count <= 60:
if count == 60:
sys.exit(1)
... ...
... ... @@ -3,14 +3,22 @@
### master 节点
基础键安装：
java,maven,node,docker,aws cli,python，git
Python
```
下载的版本为：Python-2.7.15
1.下载python2.7.x
wget https://www.python.org/ftp/python/2.7.x/Python-2.7.x.tgz
2.解压并编译安装
tar -zxvf Python-2.7.x.tgz && cd Python-2.7.x && ./configure && make all && make install && make clean && make distclean
3.检查安装
/usr/local/bin/python2.7 -V
```
需要配置环境变量，且jenkins中执行命令能够正常的使用。
## JOB-DOCKREE_NODE_BUILD
主要用于node的镜像的构建，其中涉及的流程为：
```
graph LR
清理工作空间-->克隆需要的项目
克隆需要的项目-->调用docker.sh构建项目
调用docker.sh构建项目-->静态文件上传CDN
```
... ...
#!groovy
pipeline {
agent { label 'master' }
parameters {
string(name:'ticketID', defaultValue: 'auto', description: '工单ID')
string(name:'projectName', defaultValue: 'yoho-api-doc', description: 'GITLAB应用名称')
string(name:'projectGitGroup', defaultValue: 'fe', description: 'GITLAB所在的组')
string(name:'projectBranch', defaultValue: 'master', description: 'git分支名称')
//deployName 对应了镜像名称，服务名称，aws中任务，以及服务总称
string(name:'deployName', defaultValue: 'yoho-api-doc', description: '应用名称,对应k8s的服务名，aws中任务以及服务的名称')
string(name:'userMail', defaultValue: 'jimi.ji@yoho.cn', description: '触发的人员邮箱')
string(name:'imageSource', defaultValue: 'yoho-ops', description: '镜像存储的仓库')
}
//常量参数，初始确定后一般不需更改
environment{
QA_EMAIL='jimi.ji@yoho.cn'
NODE_ENV='production'
OPS_CALL_BACK='http://www.yohops.com/outer/updateJenkinsStatus?'
}
options {
//保持构建的最大个数
buildDiscarder(logRotator(numToKeepStr: '50'))
}
stages {
stage("Define the basis para"){
steps{
script {
}
}
}
stage("git clone project : ${params.projectName}"){
steps{
script {
}
}
}
stage('Declarative: code to images push') {
steps {
script {
echo "PRINT THE PARA ticketID ${params.ticketID}......"
echo "PRINT THE PARA projectName ${params.projectName}......"
echo "PRINT THE PARA projectGitGroup ${params.projectGitGroup}......"
echo "PRINT THE PARA deployName ${params.deployName}......"
echo "PRINT THE PARA userMail ${params.userMail}......"
echo "PRINT THE PARA imageSource ${params.imageSource}......"
if(params.projectName==''){
error "no project ${params.projectName}"
}
def workdir="${env.WORKSPACE}/${params.projectName}"
sh "git clone -b ${params.branch} git@git.yoho.cn:${params.projectGitGroup}/${params.projectName}.git ${workdir}"
if(!fileExists("${workdir}/docker.sh")){
echo "you need docker.sh file in project ${params.projectName}"
error "you need docker.sh file in project ${params.projectName}"
}
if(!fileExists("${workdir}/Dockerfile")){
echo "you need Dockerfile file in project ${params.projectName}"
error "you need Dockerfile file in project ${params.projectName}"
}
sh "sh ${workdir}/docker.sh ${workdir}"
def date = new Date()
def formattedDate = date.format("yyyMMddHHMMSS")
def version="${formattedDate}-${BUILD_NUMBER}"
sh "docker build -t ccr.ccs.tencentyun.com/${params.imageSource}/${params.deployName}:${version} ${workdir}"
sh "docker push ccr.ccs.tencentyun.com/${params.imageSource}/${params.deployName}:${version}"
sh "docker tag ccr.ccs.tencentyun.com/${params.imageSource}/${params.deployName}:${version} ccr.ccs.tencentyun.com/${params.imageSource}/${params.deployName}:latest"
sh "docker push ccr.ccs.tencentyun.com/${params.imageSource}/${params.deployName}:latest"
echo "ending build push ${params.deployName}......"
}
}
}
}
post {
always {
echo "Pipeline is done，begin send mail"
deleteDir() /* clean up our workspace */
println "###############################"
sh "curl '${OPS_CALL_BACK}ticketID=${params.ticketID}&status=${currentBuild.currentResult}&jobId=${BUILD_NUMBER}'"
mail to: "${env.QA_EMAIL},${params.userMail}",
subject: "PineLine '${JOB_NAME}' (${BUILD_NUMBER}),构建结果： ${currentBuild.currentResult}",
body: "构建的内容为：${params.projectName},提交人员：${params.userMail}"
}
}
}