From 39a507b6a0647460123bbec7c70a7a0ca9906cc9 Mon Sep 17 00:00:00 2001
From: hyokeun <hyokeun.jeon@samsung.com>
Date: Mon, 24 Apr 2017 11:21:14 +0900
Subject: [PATCH] Add missing configs for aws migration

Change-Id: I25d38906a816a28de41b2bd569e8e215cfc29ebe
---
 jobs/Serivces-obs-service-gbs/config.xml           |  2 +-
 jobs/Services-Default/config.xml                   |  2 +-
 jobs/Services-jenkins-scripts/config.xml           |  2 +-
 .../config.xml                                     |  2 +-
 jobs/Services-python-snapdiff/config.xml           |  2 +-
 jobs/Tools-Default/config.xml                      |  2 +-
 jobs/Tools-bmap-tools/config.xml                   |  2 +-
 jobs/Tools-gbs/config.xml                          |  2 +-
 jobs/Tools-git-buildpackage/config.xml             |  2 +-
 jobs/Tools-mic/config.xml                          |  2 +-
 jobs/Tools-repa/config.xml                         |  2 +-
 jobs/post-image-creation/config.xml                | 18 +++++++++--
 jobs/sync-obs/config.xml                           |  2 +-
 jobs/test-trigger-info-update/config.xml           | 36 +++++++++++++---------
 14 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/jobs/Serivces-obs-service-gbs/config.xml b/jobs/Serivces-obs-service-gbs/config.xml
index a25c9c1..cd94634 100644
--- a/jobs/Serivces-obs-service-gbs/config.xml
+++ b/jobs/Serivces-obs-service-gbs/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Services-Default/config.xml b/jobs/Services-Default/config.xml
index f2554dc..e1d2a0c 100644
--- a/jobs/Services-Default/config.xml
+++ b/jobs/Services-Default/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Services-jenkins-scripts/config.xml b/jobs/Services-jenkins-scripts/config.xml
index 5375cd4..5e56769 100644
--- a/jobs/Services-jenkins-scripts/config.xml
+++ b/jobs/Services-jenkins-scripts/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Services-obs-service-git-buildpackage/config.xml b/jobs/Services-obs-service-git-buildpackage/config.xml
index 5c0c3e9..dbd0a05 100644
--- a/jobs/Services-obs-service-git-buildpackage/config.xml
+++ b/jobs/Services-obs-service-git-buildpackage/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Services-python-snapdiff/config.xml b/jobs/Services-python-snapdiff/config.xml
index b04a3f5..77650fd 100644
--- a/jobs/Services-python-snapdiff/config.xml
+++ b/jobs/Services-python-snapdiff/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Tools-Default/config.xml b/jobs/Tools-Default/config.xml
index a13b829..9d0ec1c 100644
--- a/jobs/Tools-Default/config.xml
+++ b/jobs/Tools-Default/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Tools-bmap-tools/config.xml b/jobs/Tools-bmap-tools/config.xml
index 0942244..60bf1eb 100644
--- a/jobs/Tools-bmap-tools/config.xml
+++ b/jobs/Tools-bmap-tools/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Tools-gbs/config.xml b/jobs/Tools-gbs/config.xml
index 611ef5b..6225584 100644
--- a/jobs/Tools-gbs/config.xml
+++ b/jobs/Tools-gbs/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Tools-git-buildpackage/config.xml b/jobs/Tools-git-buildpackage/config.xml
index 4add182..6075788 100644
--- a/jobs/Tools-git-buildpackage/config.xml
+++ b/jobs/Tools-git-buildpackage/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Tools-mic/config.xml b/jobs/Tools-mic/config.xml
index 29d51f8..ebf83b0 100644
--- a/jobs/Tools-mic/config.xml
+++ b/jobs/Tools-mic/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/Tools-repa/config.xml b/jobs/Tools-repa/config.xml
index 4cdaffc..131e641 100644
--- a/jobs/Tools-repa/config.xml
+++ b/jobs/Tools-repa/config.xml
@@ -74,7 +74,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginPatchsetCreatedEvent>
           <excludeDrafts>false</excludeDrafts>
diff --git a/jobs/post-image-creation/config.xml b/jobs/post-image-creation/config.xml
index 76fe503..13cf029 100644
--- a/jobs/post-image-creation/config.xml
+++ b/jobs/post-image-creation/config.xml
@@ -12,7 +12,7 @@
     </hudson.plugins.buildblocker.BuildBlockerProperty>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>7</daysToKeep>
+        <daysToKeep>6</daysToKeep>
         <numToKeep>1000</numToKeep>
         <artifactDaysToKeep>-1</artifactDaysToKeep>
         <artifactNumToKeep>-1</artifactNumToKeep>
@@ -80,6 +80,20 @@ if(matcher?.matches()) {
           <triggerWithNoParameters>false</triggerWithNoParameters>
           <triggerFromChildProjects>false</triggerFromChildProjects>
         </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+        <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
+          <configs>
+            <hudson.plugins.parameterizedtrigger.FileBuildParameters>
+              <propertiesFile>TEST-TRIGGER-INFO-UPDATE.env</propertiesFile>
+              <failTriggerOnMissing>true</failTriggerOnMissing>
+              <useMatrixChild>false</useMatrixChild>
+              <onlyExactRuns>false</onlyExactRuns>
+            </hudson.plugins.parameterizedtrigger.FileBuildParameters>
+          </configs>
+          <projects>test-trigger-info-update</projects>
+          <condition>SUCCESS</condition>
+          <triggerWithNoParameters>false</triggerWithNoParameters>
+          <triggerFromChildProjects>false</triggerFromChildProjects>
+        </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
       </configs>
     </hudson.plugins.parameterizedtrigger.BuildTrigger>
   </publishers>
@@ -108,4 +122,4 @@ if(matcher?.matches()) {
       </info>
     </EnvInjectBuildWrapper>
   </buildWrappers>
-</project>
\ No newline at end of file
+</project>
diff --git a/jobs/sync-obs/config.xml b/jobs/sync-obs/config.xml
index 29f3d73..89ae569 100644
--- a/jobs/sync-obs/config.xml
+++ b/jobs/sync-obs/config.xml
@@ -92,7 +92,7 @@
       <buildNotBuiltMessage></buildNotBuiltMessage>
       <buildUnsuccessfulFilepath></buildUnsuccessfulFilepath>
       <customUrl></customUrl>
-      <serverName>__ANY__</serverName>
+      <serverName>public_gerrit_rabbitmq</serverName>
       <triggerOnEvents>
         <com.sonyericsson.hudson.plugins.gerrit.trigger.hudsontrigger.events.PluginRefUpdatedEvent/>
       </triggerOnEvents>
diff --git a/jobs/test-trigger-info-update/config.xml b/jobs/test-trigger-info-update/config.xml
index b287df9..198d990 100644
--- a/jobs/test-trigger-info-update/config.xml
+++ b/jobs/test-trigger-info-update/config.xml
@@ -4,8 +4,11 @@
   <description></description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <hudson.plugins.buildblocker.BuildBlockerProperty plugin="build-blocker-plugin@1.4.1">
+    <hudson.plugins.buildblocker.BuildBlockerProperty plugin="build-blocker-plugin@1.7.3">
       <useBuildBlocker>false</useBuildBlocker>
+      <blockLevel>GLOBAL</blockLevel>
+      <scanQueueFor>DISABLED</scanQueueFor>
+      <blockingJobs></blockingJobs>
     </hudson.plugins.buildblocker.BuildBlockerProperty>
     <jenkins.model.BuildDiscarderProperty>
       <strategy class="hudson.tasks.LogRotator">
@@ -15,9 +18,6 @@
         <artifactNumToKeep>-1</artifactNumToKeep>
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
-    <hudson.queueSorter.PrioritySorterJobProperty plugin="PrioritySorter@2.8">
-      <priority>100</priority>
-    </hudson.queueSorter.PrioritySorterJobProperty>
     <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.25">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
@@ -43,29 +43,33 @@
   <builders>
     <hudson.tasks.Shell>
       <command>#!/bin/bash
-set -x
 
-python jenkins-scripts/job_test_trigger_info_update.py</command>
+python jenkins-scripts/job_test_trigger_info_update.py
+</command>
     </hudson.tasks.Shell>
   </builders>
   <publishers>
-    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder plugin="groovy-postbuild@1.8">
-      <groovyScript>def matcher_title = manager.getLogMatcher(&apos;.*&quot;Title&quot;: &quot;(.*)&quot;&apos;)
+    <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder plugin="groovy-postbuild@2.3.1">
+      <script plugin="script-security@1.27">
+        <script>def matcher_title = manager.getLogMatcher(&apos;.*&quot;Title&quot;: &quot;(.*)&quot;&apos;)
 
 if(matcher_title?.matches()) {
-    manager.addShortText(matcher_title.group(1))
+   manager.addShortText(&apos;\n&apos;+matcher_title.group(1))
 }
-</groovyScript>
+</script>
+        <sandbox>false</sandbox>
+      </script>
       <behavior>0</behavior>
+      <runForMatrixParent>false</runForMatrixParent>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
   </publishers>
   <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.24">
+    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.32">
       <deleteDirs>false</deleteDirs>
       <cleanupParameter></cleanupParameter>
       <externalDelete></externalDelete>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper plugin="copy-to-slave@1.4.3">
+    <com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper plugin="copy-to-slave@1.4.4">
       <includes>configuration, jenkins-scripts/job_test_trigger_info_update.py, jenkins-scripts/common/*.py</includes>
       <excludes></excludes>
       <flatten>false</flatten>
@@ -73,11 +77,15 @@ if(matcher_title?.matches()) {
       <hudsonHomeRelative>false</hudsonHomeRelative>
       <relativeTo>userContent</relativeTo>
     </com.michelin.cio.hudson.plugins.copytoslave.CopyToSlaveBuildWrapper>
-    <EnvInjectBuildWrapper plugin="envinject@1.90">
+    <EnvInjectBuildWrapper plugin="envinject@2.0">
       <info>
         <propertiesFilePath>${WORKSPACE}/configuration</propertiesFilePath>
+        <secureGroovyScript plugin="script-security@1.27">
+          <script></script>
+          <sandbox>false</sandbox>
+        </secureGroovyScript>
         <loadFilesFromMaster>false</loadFilesFromMaster>
       </info>
     </EnvInjectBuildWrapper>
   </buildWrappers>
-
+</project>
-- 
2.7.4