Fix job name, Add triggers for tools-testing

Change-Id: Icc62a266d9ba19f7cd72396f31beea310fe96d28

diff --git a/debian/jenkins-jobs-tools-testing.install b/debian/jenkins-jobs-tools-testing.install
index 4d3115c..f340ffc 100644 (file)
--- a/debian/jenkins-jobs-tools-testing.install
+++ b/debian/jenkins-jobs-tools-testing.install
@@ -1,4 +1,4 @@
-Serivces-obs-service-gbs /var/lib/jenkins/jobs/
+Services-obs-service-gbs /var/lib/jenkins/jobs/
 Services-Default /var/lib/jenkins/jobs/
 Services-jenkins-scripts /var/lib/jenkins/jobs/
 Services-obs-service-git-buildpackage /var/lib/jenkins/jobs/

diff --git a/jobs/Services-Default/config.xml b/jobs/Services-Default/config.xml
index c2a72aa..891c55a 100644 (file)
--- a/jobs/Services-Default/config.xml
+++ b/jobs/Services-Default/config.xml
@@ -51,6 +51,25 @@
           </branches>
           <disableStrictForbiddenFileVerification>false</disableStrictForbiddenFileVerification>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+          <compareType>ANT</compareType>
+          <pattern>tools/tools-testing</pattern>
+          <branches>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+              <compareType>PLAIN</compareType>
+              <pattern>master</pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+              <compareType>PLAIN</compareType>
+              <pattern>devel</pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+              <compareType>ANT</compareType>
+              <pattern>release-**</pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+          </branches>
+          <disableStrictForbiddenFileVerification>false</disableStrictForbiddenFileVerification>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
       </gerritProjects>
       <skipVote>
         <onSuccessful>false</onSuccessful>
@@ -144,4 +163,4 @@ openSUSE-13.2:python-pytest
       <completeBuild>true</completeBuild>
     </touchStoneResultCondition>
   </executionStrategy>
-</matrix-project>
\ No newline at end of file
+</matrix-project>

diff --git a/jobs/Serivces-obs-service-gbs/config.xml b/jobs/Services-obs-service-gbs/config.xml
similarity index 97%
rename from jobs/Serivces-obs-service-gbs/config.xml
rename to jobs/Services-obs-service-gbs/config.xml
index cd94634..3196f77 100644 (file)
--- a/jobs/Serivces-obs-service-gbs/config.xml
+++ b/jobs/Services-obs-service-gbs/config.xml
@@ -99,7 +99,9 @@
   </axes>
   <builders>
     <hudson.tasks.Shell>
-      <command>/usr/bin/tools-testing-run-test.sh obs-service-gbs Services -u git://review.prod.infra.tizen.org/services/obs-service-gbs.git
+      <command>#/bin/bash
+
+/usr/bin/tools-testing-run-test.sh `basename ${GERRIT_PROJECT}` Services -u git://${GIT_HOSTNAME}/${GERRIT_PROJECT}.git
 </command>
     </hudson.tasks.Shell>
   </builders>
@@ -361,9 +363,9 @@
   <buildWrappers>
     <EnvInjectBuildWrapper plugin="envinject@2.0">
       <info>
-        <propertiesContent>EXTRA_REPOS=openSUSE-12.3:http://download.prod.infra.tizen.org/Tools:/Devel/openSUSE_12.3/\
-openSUSE-13.1:http://download.prod.infra.tizen.org/Tools:/Devel/openSUSE_13.1/\
-openSUSE-13.2:http://download.prod.infra.tizen.org/Tools:/Devel/openSUSE_13.2/
+        <propertiesContent>EXTRA_REPOS=openSUSE-12.3:${URL_PUBLIC_REPO_BASE}/Tools:/Devel/openSUSE_12.3/\
+openSUSE-13.1:${URL_PUBLIC_REPO_BASE}/Tools:/Devel/openSUSE_13.1/\
+openSUSE-13.2:${URL_PUBLIC_REPO_BASE}/Tools:/Devel/openSUSE_13.2/
 TEST_REQUIRES=openSUSE-12.3:python-mock python-nose\
 openSUSE-13.1:python-mock python-nose\
 openSUSE-13.2:python-mock python-nose</propertiesContent>
@@ -385,4 +387,4 @@ openSUSE-13.2:python-mock python-nose</propertiesContent>
       <completeBuild>true</completeBuild>
     </touchStoneResultCondition>
   </executionStrategy>
-</matrix-project>
\ No newline at end of file
+</matrix-project>

diff --git a/packaging/jenkins-jobs.spec b/packaging/jenkins-jobs.spec
index a753b1e..b9a14e3 100644 (file)
--- a/packaging/jenkins-jobs.spec
+++ b/packaging/jenkins-jobs.spec
@@ -180,8 +180,8 @@ fi
 %defattr(-,jenkins,jenkins)
 %dir /var/lib/jenkins
 %dir %{destdir}
-%dir %{destdir}/Serivces-obs-service-gbs/
-%config %{destdir}/Serivces-obs-service-gbs/config.xml
+%dir %{destdir}/Services-obs-service-gbs/
+%config %{destdir}/Services-obs-service-gbs/config.xml
 %dir %{destdir}/Services-Default/
 %config %{destdir}/Services-Default/config.xml
 %dir %{destdir}/Services-jenkins-scripts/