From afd10f9075c9f37db81c9ebdf9b8c7dc74b27018 Mon Sep 17 00:00:00 2001
From: "YM-RD-AP01\\ymadmin" <johnes0714@hotmail.com>
Date: Thu, 12 Sep 2019 12:17:35 +0800
Subject: [PATCH] 20180083: Job [Hi365_SIT_Deploy_Android] hierarchy renamed
 from [Hi365_Android] to [Hi365_SIT_Deploy_Android]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change performed by §õº~?
---
 config.xml                    |  2 +-
 jobs/Hi365_Android/config.xml | 94 -----------------------------------
 2 files changed, 1 insertion(+), 95 deletions(-)
 delete mode 100644 jobs/Hi365_Android/config.xml

diff --git a/config.xml b/config.xml
index 03dc7ffd..a3b657af 100644
--- a/config.xml
+++ b/config.xml
@@ -899,8 +899,8 @@
         <string>Deploy_Hi365_OAuth_Authorization_Develop</string>
         <string>Deploy_Hi365_OAuth_Client_Develop</string>
         <string>Deploy_Hi365_OAuth_Resource_Develop</string>
-        <string>Hi365_Android</string>
         <string>Hi365_iOS</string>
+        <string>Hi365_SIT_Deploy_Android</string>
       </jobNames>
       <jobFilters/>
       <columns>
diff --git a/jobs/Hi365_Android/config.xml b/jobs/Hi365_Android/config.xml
deleted file mode 100644
index e6e3b81b..00000000
--- a/jobs/Hi365_Android/config.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>Hi365 APK Packager</description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
-      <gitLabConnection>ylhealth</gitLabConnection>
-    </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.model.ChoiceParameterDefinition>
-          <name>BUILD_BRANCH</name>
-          <description>APK build env</description>
-          <choices class="java.util.Arrays$ArrayList">
-            <a class="string-array">
-              <string>develop</string>
-              <string>master</string>
-            </a>
-          </choices>
-        </hudson.model.ChoiceParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-  </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.12.0">
-    <configVersion>2</configVersion>
-    <userRemoteConfigs>
-      <hudson.plugins.git.UserRemoteConfig>
-        <url>https://cm.ylhealth.org/gitlab/YongYue/hi365-app.git</url>
-        <credentialsId>3485e854-8389-40e8-8c86-b94e94e91904</credentialsId>
-      </hudson.plugins.git.UserRemoteConfig>
-    </userRemoteConfigs>
-    <branches>
-      <hudson.plugins.git.BranchSpec>
-        <name>*/${BUILD_BRANCH}</name>
-      </hudson.plugins.git.BranchSpec>
-    </branches>
-    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-    <submoduleCfg class="list"/>
-    <extensions/>
-  </scm>
-  <assignedNode>Mac_Node1</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>project_path=$(pwd)
-
-app_version=$(grep &apos;version:&apos; ${project_path}/pubspec.yaml | cut -d &apos; &apos; -f2)
-
-current_date=$(date +&quot;%Y%m%d&quot;)
-
-git_short_hash=$(git rev-parse --short HEAD)
-
-# determine build type by git branch
-if [ $BUILD_BRANCH == &quot;master&quot; ]
-then
-   	build_type=&quot;release&quot;
-else
-	build_type=&quot;debug&quot;
-fi
-
-output_path=&quot;${project_path}/build/app/outputs/apk/${build_type}&quot;
-
-new_apk_name=&quot;Hi365_SIT_${current_date}_${git_short_hash}.apk&quot;
-
-apk_path=&quot;${output_path}/${new_apk_name}&quot;
-
-
-flutter build apk --${build_type}
-
-# rename apk name
-mv ${output_path}/app-${build_type}.apk ${apk_path}
-
-# deploy
-echo &quot;Deploy to APK repository&quot;
-scp -i ~/jenkins/jenkins ${apk_path} appuploader@10.57.117.135:~/app/Hi365/${new_apk_name}
-</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers/>
-  <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.37">
-      <deleteDirs>false</deleteDirs>
-      <cleanupParameter></cleanupParameter>
-      <externalDelete></externalDelete>
-      <disableDeferredWipeout>false</disableDeferredWipeout>
-    </hudson.plugins.ws__cleanup.PreBuildCleanup>
-  </buildWrappers>
-</project>
\ No newline at end of file
-- 
2.26.2