Delete duplicate sync-git job conf

Change-Id: I119544a3524d3808507e0ef605ff61f874d31797
Signed-off-by: Lin Yang <lin.a.yang@intel.com>

diff --git a/jobs/syncto/config.xml b/jobs/sync-git/config.xml
similarity index 98%
rename from jobs/syncto/config.xml
rename to jobs/sync-git/config.xml
index 415324a..b9bf42c 100644 (file)
--- a/jobs/syncto/config.xml
+++ b/jobs/sync-git/config.xml
@@ -74,7 +74,7 @@
       <command>#!/bin/bash
 set -x
 
-python ${JENKINS_HOME}/jenkins-scripts/job_syncto.py</command>
+python ${JENKINS_HOME}/jenkins-scripts/job_sync_git.py</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>

diff --git a/jobs/synctd/config.xml b/jobs/synctd/config.xml
deleted file mode 100644 (file)
index e82638d..0000000
--- a/jobs/synctd/config.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>sync master branch to OBS</description>
-  <logRotator>
-    <daysToKeep>2</daysToKeep>
-    <numToKeep>-1</numToKeep>
-    <artifactDaysToKeep>-1</artifactDaysToKeep>
-    <artifactNumToKeep>-1</artifactNumToKeep>
-  </logRotator>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.queueSorter.PrioritySorterJobProperty>
-      <priority>100</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
-  </properties>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector">
-    <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
-      <spec></spec>
-      <gerritProjects>
-        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
-          <compareType>REG_EXP</compareType>
-          <pattern>^(?!scm/.*|profile/mobile/.*).+$</pattern>
-          <branches>
-            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
-              <compareType>REG_EXP</compareType>
-              <pattern>.*</pattern>
-            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
-          </branches>
-        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
-      </gerritProjects>
-      <silentMode>true</silentMode>
-      <escapeQuotes>true</escapeQuotes>
-      <triggerPatchsetCreated>false</triggerPatchsetCreated>
-      <triggerChangeMerged>false</triggerChangeMerged>
-      <triggerRefUpdated>true</triggerRefUpdated>
-      <triggerChangeAbandoned>false</triggerChangeAbandoned>
-      <triggerCommentAdded>false</triggerCommentAdded>
-      <triggerChangeRestored>false</triggerChangeRestored>
-      <retriggerChangeMerged>false</retriggerChangeMerged>
-      <buildStartMessage></buildStartMessage>
-      <buildFailureMessage></buildFailureMessage>
-      <buildSuccessfulMessage></buildSuccessfulMessage>
-      <buildUnstableMessage></buildUnstableMessage>
-      <obsMappingStr>{}</obsMappingStr>
-      <obsStagingMappingStr>{}</obsStagingMappingStr>
-      <policyStr>{}</policyStr>
-      <numberOfRetry>0</numberOfRetry>
-    </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
-  </triggers>
-  <concurrentBuild>true</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash
-set -x
-
-${JENKINS_HOME}/jenkins-scripts/job_synctd.py</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers>
-    <hudson.tasks.Mailer>
-      <recipients>lin.a.yang@intel.com</recipients>
-      <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
-      <sendToIndividuals>false</sendToIndividuals>
-    </hudson.tasks.Mailer>
-  </publishers>
-  <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup>
-      <deleteDirs>false</deleteDirs>
-    </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <EnvInjectBuildWrapper>
-      <info>
-        <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
-        <propertiesContent>GIT_CACHE_DIR=${JENKINS_HOME}/git</propertiesContent>
-        <loadFilesFromMaster>false</loadFilesFromMaster>
-      </info>
-    </EnvInjectBuildWrapper>
-  </buildWrappers>
-</project>

diff --git a/packaging/jenkins-jobs.spec b/packaging/jenkins-jobs.spec
index 00ed894..9bd667a 100644 (file)
--- a/packaging/jenkins-jobs.spec
+++ b/packaging/jenkins-jobs.spec
@@ -30,23 +30,14 @@ Requires:   jenkins-plugins >= 0.14-0.dev
 %description common
 Common part of Jenkins jobss for all instances
 
-%package synctd
-Summary:    Jobs for tizendev Jenkins instance
+%package sync
+Summary:    Jobs for tizendev/tizen.org Jenkins instance
 Group:      Development/Tools/Building
 Requires:   %{name}-common = %{version}
-Requires:   jenkins-scripts-synctd >= 0.14-0.dev
+Requires:   jenkins-scripts-sync >= 0.14-0.dev
 
-%description synctd
-Jenkins jobs for tizendev Jenkins instance
-
-%package syncto
-Summary:    Jobs for tizen.org Jenkins instance
-Group:      Development/Tools/Building
-Requires:   %{name}-common = %{version}
-Requires:   jenkins-scripts-syncto >= 0.14-0.dev
-
-%description syncto
-Jenkins jobs for tizen.org Jenkins instance
+%description sync
+Jenkins jobs for tizendev/tizen.org Jenkins instance
 
 %prep
 %setup -q
@@ -90,19 +81,12 @@ cp -rf jobs/* %{buildroot}%{destdir}/
 %dir %{destdir}/submit-obs/
 %{destdir}/submit-obs/config.xml
 
-%files synctd
-%defattr(-,jenkins,jenkins)
-%dir /var/lib/jenkins
-%dir %{destdir}
-%dir %{destdir}/synctd
-%{destdir}/synctd/config.xml
-
-%files syncto
+%files sync
 %defattr(-,jenkins,jenkins)
 %dir /var/lib/jenkins
 %dir %{destdir}
-%dir %{destdir}/syncto
-%{destdir}/syncto/config.xml
+%dir %{destdir}/sync-git
+%{destdir}/sync-git/config.xml
 
 
 %changelog