add new job config for pre-release function

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

diff --git a/jobs/DeleteTag/config.xml b/jobs/DeleteTag/config.xml
deleted file mode 100644 (file)
index 65c04be..0000000
--- a/jobs/DeleteTag/config.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>delete all tags on gerrit abandoned commit</description>
-  <keepDependencies>false</keepDependencies>
-  <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>.*</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>false</triggerRefUpdated>
-      <triggerChangeAbandoned>true</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_deletetag.sh</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers/>
-  <buildWrappers/>
-</project>
\ No newline at end of file

diff --git a/jobs/SubmitToOBS_Orig/config.xml b/jobs/SubmitToOBS_Orig/config.xml
deleted file mode 100644 (file)
index 84408c6..0000000
--- a/jobs/SubmitToOBS_Orig/config.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description>This script will submit a merged change to corresponding OBS staging project. If necessary, create SR to request merge to target OBS project.</description>
-  <keepDependencies>false</keepDependencies>
-  <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>.*</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>true</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>false</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash
-set -x
-
-python ${JENKINS_HOME}/jenkins-scripts/job_submitobs_v1.py</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger>
-      <configs>
-        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
-          <configs>
-            <hudson.plugins.parameterizedtrigger.FileBuildParameters>
-              <propertiesFile>${BUILD_TAG}.env</propertiesFile>
-            </hudson.plugins.parameterizedtrigger.FileBuildParameters>
-          </configs>
-          <projects>mail_sender, </projects>
-          <condition>SUCCESS</condition>
-          <triggerWithNoParameters>false</triggerWithNoParameters>
-        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
-      </configs>
-    </hudson.plugins.parameterizedtrigger.BuildTrigger>
-  </publishers>
-  <buildWrappers>
-    <EnvInjectBuildWrapper>
-      <info>
-        <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
-        <propertiesContent>GIT_CACHE_DIR=${JENKINS_HOME}/git</propertiesContent>
-        <loadFilesFromMaster>false</loadFilesFromMaster>
-      </info>
-    </EnvInjectBuildWrapper>
-  </buildWrappers>
-</project>
\ No newline at end of file

diff --git a/jobs/build-check/config.xml b/jobs/build-check/config.xml
new file mode 100644 (file)
index 0000000..a40420f
--- /dev/null
+++ b/jobs/build-check/config.xml
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>This job will be triggered by obs build finish event of buildcheck project in OBS, and get its build result and post it back to gerrit. If build failed, it will send out build log as mail attachment to patch owner.</description>
+  <logRotator>
+    <daysToKeep>7</daysToKeep>
+    <numToKeep>1000</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"/>
+  <quietPeriod>10</quietPeriod>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+set -x
+
+python ${JENKINS_HOME}/jenkins-scripts/job_buildcheck_post.py
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+      <groovyScript>def matcher_build = manager.getLogMatcher(&quot;.*BUILD CHECK RESULT.*&quot;)
+def matcher_prj = manager.getLogMatcher(&quot;.*\&quot;project\&quot;: \&quot;([^\&quot;]*)\&quot;.*&quot;)
+if(matcher_build?.matches() &amp;&amp; matcher_prj?.matches()) {
+    manager.addShortText(matcher_prj.group(1))
+}</groovyScript>
+      <behavior>0</behavior>
+    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+    <hudson.plugins.parameterizedtrigger.BuildTrigger>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameters>
+              <propertiesFile>${BUILD_TAG}.env</propertiesFile>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameters>
+          </configs>
+          <projects>mail_sender, </projects>
+          <condition>SUCCESS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.BuildTrigger>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup>
+      <deleteDirs>false</deleteDirs>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <EnvInjectBuildWrapper>
+      <info>
+        <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+      </info>
+    </EnvInjectBuildWrapper>
+  </buildWrappers>
+</project>
\ No newline at end of file

diff --git a/jobs/configuration b/jobs/configuration
index 68de9f9..9a91882 100644 (file)
--- a/jobs/configuration
+++ b/jobs/configuration
@@ -1,15 +1,24 @@
+#OBS related parameters
 OBS_URL=
 OBS_API_URL=
-OBS_OSCRC_PATH=
-OBS_USERNAME=
+OBS_API_USERNAME=
+OBS_API_PASSWD=
 
+#Gerrit related parameters
 GERRIT_USERNAME=
 GERRIT_HOSTNAME=
-GERRIT_SSHPORT=
+GERRIT_SSHPORT=29418
 
+#Host name of smtp server
 SMTP_SERVER=
-NOREPLY_EMAIL_SENDER=
+#The name displayed in mail for jenkins usage
+NOREPLY_EMAIL_SENDER=noreply@tizen.org
+#Mailinglist which jenkins will send SR notification to it
 MAILINGLIST=
 
+#Name of gerrit project to maintain git-obs-mapping and rpmlint-config
 MAPPING_PRJ=scm/git-obs-mapping
 RPMLINT_PRJ=scm/rpmlint-config
+
+#Jenkins local dir to cache git tree. Recommend use ${Jenkins_home}/git 
+GIT_CACHE_DIR=/var/lib/jenkins/git/

diff --git a/jobs/BuildCheck/config.xml b/jobs/delete-tag/config.xml
similarity index 55%
rename from jobs/BuildCheck/config.xml
rename to jobs/delete-tag/config.xml
index 268fe87..2a012ba 100644 (file)
--- a/jobs/BuildCheck/config.xml
+++ b/jobs/delete-tag/config.xml
@@ -1,15 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <project>
   <actions/>
-  <description>Do Build check when a change is created in gerrit</description>
+  <description>This job will delete all tags attach to commit, which is abandoned or overwritten in gerrit.</description>
   <logRotator>
-    <daysToKeep>-1</daysToKeep>
-    <numToKeep>20</numToKeep>
+    <daysToKeep>15</daysToKeep>
+    <numToKeep>-1</numToKeep>
     <artifactDaysToKeep>-1</artifactDaysToKeep>
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -30,23 +34,29 @@
           </branches>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
       </gerritProjects>
+      <skipVote>
+        <onSuccessful>false</onSuccessful>
+        <onFailed>false</onFailed>
+        <onUnstable>false</onUnstable>
+        <onNotBuilt>false</onNotBuilt>
+      </skipVote>
       <silentMode>true</silentMode>
       <escapeQuotes>true</escapeQuotes>
-      <triggerPatchsetCreated>true</triggerPatchsetCreated>
-      <triggerChangeMerged>false</triggerChangeMerged>
-      <triggerRefUpdated>false</triggerRefUpdated>
-      <triggerChangeAbandoned>false</triggerChangeAbandoned>
-      <triggerCommentAdded>false</triggerCommentAdded>
-      <triggerChangeRestored>false</triggerChangeRestored>
-      <retriggerChangeMerged>false</retriggerChangeMerged>
+      <noNameAndEmailParameters>false</noNameAndEmailParameters>
       <buildStartMessage></buildStartMessage>
       <buildFailureMessage></buildFailureMessage>
       <buildSuccessfulMessage></buildSuccessfulMessage>
       <buildUnstableMessage></buildUnstableMessage>
-      <obsMappingStr>{}</obsMappingStr>
-      <obsStagingMappingStr>{}</obsStagingMappingStr>
-      <policyStr>{}</policyStr>
-      <numberOfRetry>0</numberOfRetry>
+      <buildNotBuiltMessage></buildNotBuiltMessage>
+      <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
+      <customUrl></customUrl>
+      <triggerOnEvents>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginChangeAbandonedEvent/>
+      </triggerOnEvents>
+      <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration>
+      <triggerConfigURL></triggerConfigURL>
+      <triggerInformationAction/>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
   </triggers>
   <concurrentBuild>true</concurrentBuild>
@@ -55,31 +65,17 @@
       <command>#!/bin/bash
 set -x
 
-python ${JENKINS_HOME}/jenkins-scripts/job_buildcheck.py
-</command>
+${JENKINS_HOME}/jenkins-scripts/job_deletetag.sh</command>
     </hudson.tasks.Shell>
   </builders>
-  <publishers>
-    <hudson.plugins.parameterizedtrigger.BuildTrigger>
-      <configs>
-        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
-          <configs>
-            <hudson.plugins.parameterizedtrigger.FileBuildParameters>
-              <propertiesFile>${BUILD_TAG}.env</propertiesFile>
-            </hudson.plugins.parameterizedtrigger.FileBuildParameters>
-          </configs>
-          <projects>mail_sender, </projects>
-          <condition>FAILED</condition>
-          <triggerWithNoParameters>false</triggerWithNoParameters>
-        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
-      </configs>
-    </hudson.plugins.parameterizedtrigger.BuildTrigger>
-  </publishers>
+  <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>

diff --git a/jobs/image-creator/config.xml b/jobs/image-creator/config.xml
new file mode 100644 (file)
index 0000000..917d96d
--- /dev/null
+++ b/jobs/image-creator/config.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>imager</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#/bin/bash
+
+python jenkins-scripts/job_imager.py</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+      <groovyScript>if( manager.logContains(&quot;Info: Finished.*&quot;)){
+//    def matcher2 = manager.getMatcher(manager.build.logFile, &quot;.*home:/hudson:/(.*)/images.*&quot;)
+    manager.addBadge(&quot;success.gif&quot;, &quot;&quot;) // matcher2.group(1))
+
+}else{
+    manager.addShortText(&quot;??&quot;)
+   //manager.build.delete()
+}</groovyScript>
+      <behavior>0</behavior>
+    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+  </publishers>
+  <buildWrappers>
+    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+      <includes>configuration, jenkins-scripts/job_imager.py, jenkins-scripts/common/*, jenkins-scripts/repomaker/*, jenkins-scripts/images/*</includes>
+      <excludes></excludes>
+      <flatten>false</flatten>
+      <includeAntExcludes>false</includeAntExcludes>
+      <hudsonHomeRelative>false</hudsonHomeRelative>
+      <relativeTo>userContent</relativeTo>
+    </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+    <EnvInjectBuildWrapper>
+      <info>
+        <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+      </info>
+    </EnvInjectBuildWrapper>
+  </buildWrappers>
+</project>
\ No newline at end of file

diff --git a/jobs/mail_sender/config.xml b/jobs/mail_sender/config.xml
index 0d7c703..49c5834 100644 (file)
--- a/jobs/mail_sender/config.xml
+++ b/jobs/mail_sender/config.xml
@@ -1,12 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <project>
   <actions/>
-  <description></description>
+  <description>This job will be triggered by others to send out email.</description>
+  <logRotator>
+    <daysToKeep>7</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
-  <disabled>false</disabled>
+  <disabled>true</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
   <triggers class="vector"/>

diff --git a/jobs/obs-event-dispatcher/config.xml b/jobs/obs-event-dispatcher/config.xml
new file mode 100644 (file)
index 0000000..01c6124
--- /dev/null
+++ b/jobs/obs-event-dispatcher/config.xml
@@ -0,0 +1,129 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>event_type</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>project</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>para</name>
+          <description></description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+
+python ${JENKINS_HOME}/jenkins-scripts/job_jobs_dispatcher.py</command>
+    </hudson.tasks.Shell>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs class="java.util.Collections$EmptyList"/>
+          <configFactories>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+              <filePattern>OBS_REPO_PUBLISHED.env</filePattern>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+          </configFactories>
+          <projects>pre-release-create</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs class="java.util.Collections$EmptyList" reference="../../../../hudson.plugins.parameterizedtrigger.TriggerBuilder/configs/hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig/configs"/>
+          <configFactories>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+              <filePattern>OBS_SRCSRV_REQUEST_*.env</filePattern>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+          </configFactories>
+          <projects>requests</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs class="java.util.Collections$EmptyList" reference="../../../../hudson.plugins.parameterizedtrigger.TriggerBuilder/configs/hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig/configs"/>
+          <configFactories>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+              <filePattern>OBS_REPO_PUBLISH_STATE.env</filePattern>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+          </configFactories>
+          <projects>BuildCheck</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs class="java.util.Collections$EmptyList" reference="../../../../hudson.plugins.parameterizedtrigger.TriggerBuilder/configs/hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig/configs"/>
+          <configFactories>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+              <filePattern>OBS_SRCSRV_REQUEST_STATECHANGE.env</filePattern>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+          </configFactories>
+          <projects>pre-release-cleanup</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+      <groovyScript>def matcher_trigger = manager.getLogMatcher(&quot;.*LOG:TRIGGER_NEXT:([^ ]*).*&quot;)
+if(matcher_trigger?.matches()) {
+    manager.addShortText(matcher_trigger.group(1))
+}//else{
+    //manager.build.delete()
+
+//}</groovyScript>
+      <behavior>0</behavior>
+    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+    <hudson.plugins.ws__cleanup.WsCleanup>
+      <deleteDirs>false</deleteDirs>
+      <skipWhenFailed>false</skipWhenFailed>
+    </hudson.plugins.ws__cleanup.WsCleanup>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup>
+      <deleteDirs>false</deleteDirs>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+  </buildWrappers>
+</project>
\ No newline at end of file

diff --git a/jobs/PolicyCheck/config.xml b/jobs/policy-check/config.xml
similarity index 59%
rename from jobs/PolicyCheck/config.xml
rename to jobs/policy-check/config.xml
index 25376e0..06aa11a 100644 (file)
--- a/jobs/PolicyCheck/config.xml
+++ b/jobs/policy-check/config.xml
@@ -1,9 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <project>
   <actions/>
-  <description>Do policy check when a change is created in gerrit</description>
+  <description>This job will do policy check, like rpmlint check and build check, when a change is created in gerrit.</description>
+  <logRotator>
+    <daysToKeep>15</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -24,23 +34,28 @@
           </branches>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
       </gerritProjects>
+      <skipVote>
+        <onSuccessful>false</onSuccessful>
+        <onFailed>false</onFailed>
+        <onUnstable>false</onUnstable>
+        <onNotBuilt>false</onNotBuilt>
+      </skipVote>
       <silentMode>true</silentMode>
       <escapeQuotes>true</escapeQuotes>
-      <triggerPatchsetCreated>true</triggerPatchsetCreated>
-      <triggerChangeMerged>false</triggerChangeMerged>
-      <triggerRefUpdated>false</triggerRefUpdated>
-      <triggerChangeAbandoned>false</triggerChangeAbandoned>
-      <triggerCommentAdded>false</triggerCommentAdded>
-      <triggerChangeRestored>false</triggerChangeRestored>
-      <retriggerChangeMerged>false</retriggerChangeMerged>
+      <noNameAndEmailParameters>false</noNameAndEmailParameters>
       <buildStartMessage></buildStartMessage>
       <buildFailureMessage></buildFailureMessage>
       <buildSuccessfulMessage></buildSuccessfulMessage>
       <buildUnstableMessage></buildUnstableMessage>
-      <obsMappingStr>{}</obsMappingStr>
-      <obsStagingMappingStr>{}</obsStagingMappingStr>
-      <policyStr>{}</policyStr>
-      <numberOfRetry>0</numberOfRetry>
+      <buildNotBuiltMessage></buildNotBuiltMessage>
+      <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
+      <customUrl></customUrl>
+      <triggerOnEvents>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent/>
+      </triggerOnEvents>
+      <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration>
+      <triggerConfigURL></triggerConfigURL>
+      <triggerInformationAction/>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
   </triggers>
   <concurrentBuild>true</concurrentBuild>
@@ -54,10 +69,12 @@ python ${JENKINS_HOME}/jenkins-scripts/job_policycheck.py</command>
   </builders>
   <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>

diff --git a/jobs/pre-release-cleanup/config.xml b/jobs/pre-release-cleanup/config.xml
new file mode 100644 (file)
index 0000000..e4fe46c
--- /dev/null
+++ b/jobs/pre-release-cleanup/config.xml
@@ -0,0 +1,64 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>    </description>
+  <logRotator>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>1000</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"/>
+  <quietPeriod>0</quietPeriod>
+  <assignedNode>download</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+
+python ${WORKSPACE}/jenkins-scripts/job_pre_release_obs.py cleanup</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+      <groovyScript>def matcher = manager.getMatcher(manager.build.logFile, &quot;home:hudson:prerelease:(.*)&quot;)
+if(matcher?.matches()) {
+    manager.addShortText(matcher.group(1))
+}else{
+    manager.addShortText(&quot;??&quot;)
+   //manager.build.delete()
+}</groovyScript>
+      <behavior>0</behavior>
+    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup>
+      <deleteDirs>false</deleteDirs>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+      <includes>configuration, jenkins-scripts/job_pre_release_obs.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
+      <excludes></excludes>
+      <flatten>false</flatten>
+      <includeAntExcludes>false</includeAntExcludes>
+      <hudsonHomeRelative>false</hudsonHomeRelative>
+      <relativeTo>userContent</relativeTo>
+    </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+    <EnvInjectBuildWrapper>
+      <info>
+        <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+      </info>
+    </EnvInjectBuildWrapper>
+  </buildWrappers>
+</project>
\ No newline at end of file

diff --git a/jobs/pre-release-create/config.xml b/jobs/pre-release-create/config.xml
new file mode 100644 (file)
index 0000000..d40d951
--- /dev/null
+++ b/jobs/pre-release-create/config.xml
@@ -0,0 +1,82 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>    </description>
+  <logRotator>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>1000</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"/>
+  <quietPeriod>0</quietPeriod>
+  <assignedNode>download</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#/bin/bash
+
+python jenkins-scripts/job_pre_release_obs.py create_images
+
+</command>
+    </hudson.tasks.Shell>
+    <hudson.plugins.parameterizedtrigger.TriggerBuilder>
+      <configs>
+        <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+          <configs class="java.util.Collections$EmptyList"/>
+          <configFactories>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+              <filePattern>image_trigger_*.env </filePattern>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameterFactory>
+          </configFactories>
+          <projects>image-creator</projects>
+          <condition>ALWAYS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <buildAllNodesWithLabel>false</buildAllNodesWithLabel>
+        </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig>
+      </configs>
+    </hudson.plugins.parameterizedtrigger.TriggerBuilder>
+  </builders>
+  <publishers>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+      <groovyScript>def matcher = manager.getMatcher(manager.build.logFile, &quot;home:hudson:prerelease:(.*)&quot;)
+if(matcher?.matches()) {
+    manager.addShortText(matcher.group(1))
+}else{
+    manager.addShortText(&quot;??&quot;)
+   //manager.build.delete()
+}</groovyScript>
+      <behavior>0</behavior>
+    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup>
+      <deleteDirs>false</deleteDirs>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+      <includes>configuration, jenkins-scripts/job_pre_release_obs.py, jenkins-scripts/common/*, jenkins-scripts/testprojects/*, jenkins-scripts/gitbuildsys/*</includes>
+      <excludes></excludes>
+      <flatten>false</flatten>
+      <includeAntExcludes>false</includeAntExcludes>
+      <hudsonHomeRelative>false</hudsonHomeRelative>
+      <relativeTo>userContent</relativeTo>
+    </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
+    <EnvInjectBuildWrapper>
+      <info>
+        <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+      </info>
+    </EnvInjectBuildWrapper>
+  </buildWrappers>
+</project>
\ No newline at end of file

diff --git a/jobs/pre-release-gerrit/config.xml b/jobs/pre-release-gerrit/config.xml
new file mode 100644 (file)
index 0000000..cb1399a
--- /dev/null
+++ b/jobs/pre-release-gerrit/config.xml
@@ -0,0 +1,88 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description> </description>
+  <logRotator>
+    <daysToKeep>-1</daysToKeep>
+    <numToKeep>189</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>ANT</compareType>
+          <pattern>**</pattern>
+          <branches>
+            <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+              <compareType>ANT</compareType>
+              <pattern>refs/tags/submit/**</pattern>
+            </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.Branch>
+          </branches>
+        </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
+      </gerritProjects>
+      <skipVote>
+        <onSuccessful>false</onSuccessful>
+        <onFailed>false</onFailed>
+        <onUnstable>false</onUnstable>
+        <onNotBuilt>false</onNotBuilt>
+      </skipVote>
+      <silentMode>false</silentMode>
+      <escapeQuotes>true</escapeQuotes>
+      <noNameAndEmailParameters>false</noNameAndEmailParameters>
+      <buildStartMessage></buildStartMessage>
+      <buildFailureMessage></buildFailureMessage>
+      <buildSuccessfulMessage></buildSuccessfulMessage>
+      <buildUnstableMessage></buildUnstableMessage>
+      <buildNotBuiltMessage></buildNotBuiltMessage>
+      <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
+      <customUrl></customUrl>
+      <triggerOnEvents>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginRefUpdatedEvent/>
+      </triggerOnEvents>
+      <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration>
+      <triggerConfigURL></triggerConfigURL>
+      <triggerInformationAction/>
+    </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
+  </triggers>
+  <concurrentBuild>false</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/bash
+export 
+set |grep GERRIT_
+python ${JENKINS_HOME}/jenkins-scripts/job_pre_release_gerrit.py</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+      <groovyScript></groovyScript>
+      <behavior>0</behavior>
+    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+  </publishers>
+  <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup>
+      <deleteDirs>false</deleteDirs>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
+    <EnvInjectBuildWrapper>
+      <info>
+        <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
+        <propertiesContent>MAPPING_PROJECTS=scm/git-obs-mapping</propertiesContent>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+      </info>
+    </EnvInjectBuildWrapper>
+  </buildWrappers>
+</project>
\ No newline at end of file

diff --git a/jobs/requests/config.xml b/jobs/requests/config.xml
index 392dd6d..891dfed 100644 (file)
--- a/jobs/requests/config.xml
+++ b/jobs/requests/config.xml
@@ -3,7 +3,11 @@
   <actions/>
   <description> </description>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>100</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -26,6 +30,12 @@
           <pattern>{ &quot;fields&quot;: { &quot;obsEvent&quot;: { &quot;type&quot;: &quot;OBS_SRCSRV_REQUEST_CREATE&quot; } } };</pattern>
         </com.intel.jenkins.plugins.obsevent.data.CompareEvent>
       </interestedEvents>
+      <amqpHost>127.0.0.1</amqpHost>
+      <amqpPort>5672</amqpPort>
+      <amqpVhost>boss</amqpVhost>
+      <amqpUser>boss</amqpUser>
+      <amqpPass>boss</amqpPass>
+      <amqpQueue>requests</amqpQueue>
       <logging>LOGGING_NONE</logging>
     </com.intel.jenkins.plugins.obsevent.trigger.ObsEventTrigger>
   </triggers>
@@ -54,6 +64,9 @@ python ${JENKINS_HOME}/jenkins-scripts/job_request.py</command>
     </hudson.plugins.parameterizedtrigger.BuildTrigger>
   </publishers>
   <buildWrappers>
+    <hudson.plugins.ws__cleanup.PreBuildCleanup>
+      <deleteDirs>false</deleteDirs>
+    </hudson.plugins.ws__cleanup.PreBuildCleanup>
     <EnvInjectBuildWrapper>
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
@@ -64,4 +77,4 @@ EMAIL_TEMPLATES_DIR=${JENKINS_HOME}/jenkins-scripts/requests/email_templates/</p
       </info>
     </EnvInjectBuildWrapper>
   </buildWrappers>
-</project>
+</project>
\ No newline at end of file

diff --git a/jobs/ruote_workitems/config.xml b/jobs/ruote_workitems/config.xml
deleted file mode 100644 (file)
index b12eb4a..0000000
--- a/jobs/ruote_workitems/config.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<project>
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties/>
-  <scm class="hudson.scm.NullSCM"/>
-  <canRoam>true</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector">
-    <com.intel.jenkins.plugins.obsevent.trigger.ObsEventTrigger>
-      <spec></spec>
-      <interestedEvents>
-        <com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-          <compareType>REG_EXP</compareType>
-          <pattern>{ &quot;fields&quot;: { &quot;obsEvent&quot;: { &quot;type&quot;: &quot;OBS_SRCSRV_REQUEST_.*&quot; } } };</pattern>
-        </com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-        <com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-          <compareType>PLAIN</compareType>
-          <pattern>{ &quot;fields&quot;: { &quot;obsEvent&quot;: { &quot;type&quot;: &quot;OBS_REPO_PUBLISHED&quot; } } };</pattern>
-        </com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-        <com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-          <compareType>PLAIN</compareType>
-          <pattern>{ &quot;fields&quot;: { &quot;obsEvent&quot;: { &quot;type&quot;: &quot;OBS_BUILD_SUCCESS&quot; } } };</pattern>
-        </com.intel.jenkins.plugins.obsevent.data.CompareEvent>
-      </interestedEvents>
-      <logging>LOGGING_NONE</logging>
-    </com.intel.jenkins.plugins.obsevent.trigger.ObsEventTrigger>
-  </triggers>
-  <concurrentBuild>false</concurrentBuild>
-  <builders>
-    <hudson.tasks.Shell>
-      <command>#!/bin/bash
-set -x
-
-python ${JENKINS_HOME}/jenkins-scripts/job_obsevent_dispatcher.py</command>
-    </hudson.tasks.Shell>
-  </builders>
-  <publishers/>
-  <buildWrappers>
-    <EnvInjectBuildWrapper>
-      <info>
-        <propertiesContent># which queue to dispatch to if received a request event
-REQUESTS_QUEUE_NAME = requests
-
-# which queue to dispatch to if received a repo published event 
-REPOMAKER_QUEUE_NAME = repomaker
-
-# which queue to dispatch to if received a build success event
-BUILD_STATUS_QUEUE_NAME = build_status
-</propertiesContent>
-        <loadFilesFromMaster>false</loadFilesFromMaster>
-      </info>
-    </EnvInjectBuildWrapper>
-  </buildWrappers>
-</project>

diff --git a/jobs/SubmitToOBS/config.xml b/jobs/submit-obs/config.xml
similarity index 61%
rename from jobs/SubmitToOBS/config.xml
rename to jobs/submit-obs/config.xml
index 34baaea..7db4b6e 100644 (file)
--- a/jobs/SubmitToOBS/config.xml
+++ b/jobs/submit-obs/config.xml
@@ -2,8 +2,18 @@
 <project>
   <actions/>
   <description>This script will submit a merged change to corresponding OBS staging project. If necessary, create SR to request merge to target OBS project.</description>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
   <keepDependencies>false</keepDependencies>
-  <properties/>
+  <properties>
+    <hudson.queueSorter.PrioritySorterJobProperty>
+      <priority>101</priority>
+    </hudson.queueSorter.PrioritySorterJobProperty>
+  </properties>
   <scm class="hudson.scm.NullSCM"/>
   <canRoam>true</canRoam>
   <disabled>false</disabled>
@@ -24,23 +34,29 @@
           </branches>
         </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.data.GerritProject>
       </gerritProjects>
+      <skipVote>
+        <onSuccessful>false</onSuccessful>
+        <onFailed>false</onFailed>
+        <onUnstable>false</onUnstable>
+        <onNotBuilt>false</onNotBuilt>
+      </skipVote>
       <silentMode>true</silentMode>
       <escapeQuotes>true</escapeQuotes>
-      <triggerPatchsetCreated>false</triggerPatchsetCreated>
-      <triggerChangeMerged>true</triggerChangeMerged>
-      <triggerRefUpdated>true</triggerRefUpdated>
-      <triggerChangeAbandoned>false</triggerChangeAbandoned>
-      <triggerCommentAdded>false</triggerCommentAdded>
-      <triggerChangeRestored>false</triggerChangeRestored>
-      <retriggerChangeMerged>false</retriggerChangeMerged>
+      <noNameAndEmailParameters>false</noNameAndEmailParameters>
       <buildStartMessage></buildStartMessage>
       <buildFailureMessage></buildFailureMessage>
       <buildSuccessfulMessage></buildSuccessfulMessage>
       <buildUnstableMessage></buildUnstableMessage>
-      <obsMappingStr>{}</obsMappingStr>
-      <obsStagingMappingStr>{}</obsStagingMappingStr>
-      <policyStr>{}</policyStr>
-      <numberOfRetry>0</numberOfRetry>
+      <buildNotBuiltMessage></buildNotBuiltMessage>
+      <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
+      <customUrl></customUrl>
+      <triggerOnEvents>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginRefUpdatedEvent/>
+        <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginChangeMergedEvent/>
+      </triggerOnEvents>
+      <dynamicTriggerConfiguration>false</dynamicTriggerConfiguration>
+      <triggerConfigURL></triggerConfigURL>
+      <triggerInformationAction/>
     </com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.GerritTrigger>
   </triggers>
   <concurrentBuild>false</concurrentBuild>
@@ -53,6 +69,13 @@ python ${JENKINS_HOME}/jenkins-scripts/job_submitobs.py</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
+      <groovyScript>def matcher = manager.getMatcher(manager.build.logFile, &quot;.*Request URL:([^\&quot;]*).*&quot;)
+if(matcher?.matches()) {
+    manager.addShortText(&quot;&lt;a href=\&quot;${matcher.group(1)}\&quot;&gt;${matcher.group(1)}&lt;/a&gt;&quot;)
+}</groovyScript>
+      <behavior>0</behavior>
+    </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
     <hudson.plugins.parameterizedtrigger.BuildTrigger>
       <configs>
         <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -69,10 +92,12 @@ python ${JENKINS_HOME}/jenkins-scripts/job_submitobs.py</command>
     </hudson.plugins.parameterizedtrigger.BuildTrigger>
   </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>