jta: Fix template-dev target DISTRIB env variable
diff mbox

Message ID 56A8DDB2.6030306@sonymobile.com
State New
Headers show

Commit Message

Bird, Tim Jan. 27, 2016, 3:09 p.m. UTC
The current front-end Jenkins configuration for the template-dev
board currently uses DISTR instead of DISTRIB as an environment
variable to specify the distribution overlay file to use.

This caused an error when processing tests for any targets copied
from that board, about the missing DISTRIB environment variable.
From the console log:

  +++ abort_job 'DISTRIB is not defined'
  +++ set +x

  *** ABORTED ***

  JTA error reason: DISTRIB is not defined

Also, this patch adds a missing newline at the end of config.xml
---

(As a side note, this was harder to find and fix than expected, because
there's another bug in the JTA system.  If you edit a target configuration
in the Jenkins interface, it breaks the symlink from /userdata/conf/config.xml
to /var/lib/jenkins/config.xml.  I'll post a separate bug report on that.
But, the gist of it is that after you make a single edit to a target in 
the Jenkins interface, the changes are not reflected in the host
userdata/conf/config.xml file (and vice-versa) from then on.)

 userdata/conf/config.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch
diff mbox

diff --git a/userdata/conf/config.xml b/userdata/conf/config.xml
index 423d034..8cde7f5 100644
--- a/userdata/conf/config.xml
+++ b/userdata/conf/config.xml
@@ -42,7 +42,7 @@ 
               <int>2</int>
               <string>BOARD_OVERLAY</string>
               <string>boards/template-dev.board</string>
-              <string>DISTR</string>
+              <string>DISTRIB</string>
               <string>distribs/nologger.dist</string>
             </tree-map>
           </envVars>
@@ -331,4 +331,4 @@ 
       </envVars>
     </hudson.slaves.EnvironmentVariablesNodeProperty>
   </globalNodeProperties>
-</hudson>
\ No newline at end of file
+</hudson>