update jobs configures for postscripts and misc changes

Fixes: #1180

Signed-off-by: Hasan Wan <hasan.wan@intel.com>

diff --git a/jobs/image-creator/config.xml b/jobs/image-creator/config.xml
index cd16749..bdfede9 100644 (file)
--- a/jobs/image-creator/config.xml
+++ b/jobs/image-creator/config.xml
@@ -21,6 +21,7 @@
       <command>#/bin/bash
 unset http_proxy
 unset https_proxy
+export no_proxy=&quot;localhost,.intel.com&quot;
 python jenkins-scripts/job_imager.py</command>
     </hudson.tasks.Shell>
   </builders>

diff --git a/jobs/obs-event-dispatcher/config.xml b/jobs/obs-event-dispatcher/config.xml
index b00a8b5..f85125a 100644 (file)
--- a/jobs/obs-event-dispatcher/config.xml
+++ b/jobs/obs-event-dispatcher/config.xml
@@ -38,7 +38,7 @@
     <hudson.tasks.Shell>
       <command>#!/bin/bash
 
-python jenkins-scripts/job_jobs_dispatcher.py</command>
+python ${WORKSPACE}/jenkins-scripts/job_jobs_dispatcher.py</command>
     </hudson.tasks.Shell>
     <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.18">
       <configs>

diff --git a/jobs/pre-release-create/config.xml b/jobs/pre-release-create/config.xml
index 582da58..b1b5949 100644 (file)
--- a/jobs/pre-release-create/config.xml
+++ b/jobs/pre-release-create/config.xml
@@ -51,13 +51,15 @@ python jenkins-scripts/job_pre_release_obs.py create_images
   </builders>
   <publishers>
     <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder plugin="groovy-postbuild@1.8">
-      <groovyScript>def matcher = manager.getMatcher(manager.build.logFile, &quot;home:hudson:prerelease:(.*)&quot;)
+      <groovyScript>def matcher = manager.getLogMatcher(&quot;.*home:prerelease:(.*)\$&quot;)
+
 if(matcher?.matches()) {
     manager.addShortText(matcher.group(1))
 }else{
     manager.addShortText(&quot;??&quot;)
    //manager.build.delete()
-}</groovyScript>
+}
+</groovyScript>
       <behavior>0</behavior>
     </org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder>
     <hudson.plugins.ws__cleanup.WsCleanup plugin="ws-cleanup@0.16">

diff --git a/jobs/pre-release-gerrit/config.xml b/jobs/pre-release-gerrit/config.xml
index fe8b518..0746c64 100644 (file)
--- a/jobs/pre-release-gerrit/config.xml
+++ b/jobs/pre-release-gerrit/config.xml
@@ -4,7 +4,7 @@
   <description> </description>
   <logRotator class="hudson.tasks.LogRotator">
     <daysToKeep>-1</daysToKeep>
-    <numToKeep>189</numToKeep>
+    <numToKeep>1000</numToKeep>
     <artifactDaysToKeep>-1</artifactDaysToKeep>
     <artifactNumToKeep>-1</artifactNumToKeep>
   </logRotator>
@@ -70,7 +70,15 @@ python ${JENKINS_HOME}/jenkins-scripts/job_pre_release_gerrit.py</command>
   </builders>
   <publishers>
     <org.jvnet.hudson.plugins.groovypostbuild.GroovyPostbuildRecorder plugin="groovy-postbuild@1.8">
-      <groovyScript></groovyScript>
+      <groovyScript>def matcher = manager.getLogMatcher(&quot;.*home: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>

diff --git a/jobs/requests/config.xml b/jobs/requests/config.xml
index a10ff65..dbbef19 100644 (file)
--- a/jobs/requests/config.xml
+++ b/jobs/requests/config.xml
@@ -18,7 +18,7 @@
   <builders>
     <hudson.tasks.Shell>
       <command>#!/bin/bash
-
+set -x
 python ${JENKINS_HOME}/jenkins-scripts/job_request.py</command>
     </hudson.tasks.Shell>
   </builders>
@@ -47,9 +47,7 @@ python ${JENKINS_HOME}/jenkins-scripts/job_request.py</command>
     <EnvInjectBuildWrapper plugin="envinject@1.88">
       <info>
         <propertiesFilePath>${JENKINS_HOME}/jobs/configuration</propertiesFilePath>
-        <propertiesContent>GIT_CACHE_DIR=${JENKINS_HOME}/git
-
-EMAIL_TEMPLATES_DIR=${JENKINS_HOME}/jenkins-scripts/requests/email_templates/</propertiesContent>
+        <propertiesContent>EMAIL_TEMPLATES_DIR=${JENKINS_HOME}/jenkins-scripts/requests/email_templates/</propertiesContent>
         <loadFilesFromMaster>false</loadFilesFromMaster>
       </info>
     </EnvInjectBuildWrapper>