yoho-cicd / jenkins-pipeline · Commits

Go to a project

Authored by jimi.ji
Commit 0a5fc4da72251486e9786dc69745e8e024c208cf 1 parent c9cf26ff

docker qcloud deploy

Inline Side-by-side
Showing 2 changed files with 17 additions and 17 deletions
... ... @@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="73f1c4c4-a4e0-4e72-aa1b-7be1b346abcf" name="Default" comment="">
<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$/Docker-Image-Deplopy/Jenkinsfile" afterPath="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
</list>
<ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -29,21 +29,21 @@
</provider>
</entry>
</file>
<file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="false">
<file leaf-file-name="Jenkinsfile" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="66" column="13" lean-forward="true" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
<state relative-caret-position="257">
<caret line="50" column="17" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="17" />
<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="81">
<caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
<state relative-caret-position="-1863">
<caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state>
</provider>
... ... @@ -100,8 +100,8 @@
<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$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py" />
<option value="$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile" />
</list>
</option>
</component>
... ... @@ -600,12 +600,12 @@
<workItem from="1545905663805" duration="1370000" />
<workItem from="1545965888175" duration="20585000" />
<workItem from="1546047561789" duration="16674000" />
<workItem from="1546394046618" duration="4373000" />
<workItem from="1546394046618" duration="4527000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="54748000" />
<option name="totallyTimeSpent" value="54902000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
... ... @@ -924,18 +924,18 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="66" column="13" lean-forward="true" selection-start-line="66" selection-start-column="13" selection-end-line="66" selection-end-column="13" />
<state relative-caret-position="-1863">
<caret line="6" column="13" lean-forward="true" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/qcloud/qcloudDeploy.py">
<entry file="file://$PROJECT_DIR$/Docker-Image-Deplopy/Jenkinsfile">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81">
<caret line="3" column="11" lean-forward="true" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
<state relative-caret-position="257">
<caret line="50" column="17" lean-forward="true" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="17" />
<folding />
</state>
</provider>
... ...
... ... @@ -44,7 +44,7 @@ pipeline {
if(params.deployEnv=='qcloud' || params.deployEnv=='all'){
//切换kubectl的认证
def pyworkdir="${env.WORKSPACE}/Docker-Image-Deplopy/qcloud/qcloudDeploy.py"
sh "sh ${pyworkdir} ${params.clusterId} ${params.serviceName} ${params.containerName} ${params.imageInfo}"
sh "python ${pyworkdir} ${params.clusterId} ${params.serviceName} ${params.containerName} ${params.imageInfo}"
}else {
println "qcloud this no need deploy"
}
... ...