Merge lp:~fginther/cupstream2distro/jenkins-home into lp:cupstream2distro

[Francis Ginther]

Relocate JENKINS_HOME directory, provide CLI options to set.

Relocate JENKINS_HOME directory, provide CLI options to set.

Jenkins provides $JENKINS_HOME as the root of the jenkins FS. Jobs should be referencing this when the jenkins root path is required.

[Didier Roche-Tolomelli (didrocks)]

8 -STACK_RUNNING_DIR = "/var/lib/jenkins/cu2d/work"
9 -STACK_STATUS_PUBLISHING_DIR = "/var/lib/jenkins/cu2d/result_publishing"
10 +STACK_RUNNING_DIR = "/iSCSI/jenkins/cu2d/work"
11 +STACK_STATUS_PUBLISHING_DIR = "/iSCSI/jenkins/cu2d/result_publishing"
Francis: are you sure about those changes?

the stacks run and we were able to publish content, so it means (I ls /var/lib/jenkins/cu2d/work and see latest content here). Can you double check? What's in "/var/lib/jenkins/cu2d/work" then and why does it work with some autopilot tests (like sdk today)

On changing latest_autopilot_results and stack_status, jibel did those scripts, so better to check with him

review: Needs Information

[Jean-Baptiste Lallement (jibel)]

You can also update :

cupstream2distro-config/daily-release/jenkins-templates/master-config.xml.tmpl:{{ BINDIR }}/stack_status -s {{ stack }} -r {{ release }}

to pass jenkins root as argument and not rely on the default value.

Otherwise LGTM, thanks!

review: Approve

[Francis Ginther (fginther)]

> 8 -STACK_RUNNING_DIR = "/var/lib/jenkins/cu2d/work"
> 9 -STACK_STATUS_PUBLISHING_DIR =
> "/var/lib/jenkins/cu2d/result_publishing"
> 10 +STACK_RUNNING_DIR = "/iSCSI/jenkins/cu2d/work"
> 11 +STACK_STATUS_PUBLISHING_DIR = "/iSCSI/jenkins/cu2d/result_publishing"
> Francis: are you sure about those changes?
>
> the stacks run and we were able to publish content, so it means (I ls
> /var/lib/jenkins/cu2d/work and see latest content here). Can you double check?
> What's in "/var/lib/jenkins/cu2d/work" then and why does it work with some
> autopilot tests (like sdk today)
>
>
> On changing latest_autopilot_results and stack_status, jibel did those
> scripts, so better to check with him

So /var/lib/jenkins is there and will be maintained as a backup, but it's not the live data being generated by jenkins. Anything new history here (as jibel mentioned) will need to be updated back to /iSCSI/jenkins when we complete the cut-over.

[Francis Ginther (fginther)]

> You can also update :
>
> cupstream2distro-config/daily-release/jenkins-templates/master-
> config.xml.tmpl:{{ BINDIR }}/stack_status -s {{ stack }} -r {{ release }}
>
> to pass jenkins root as argument and not rely on the default value.
>
> Otherwise LGTM, thanks!

I've created https://code.launchpad.net/~fginther/cupstream2distro-config/update-stack_status/+merge/195956 to update the callers.

[Didier Roche-Tolomelli (didrocks)]

ok, thanks for the infos then!

review: Approve

=== modified file 'cupstream2distro/settings.py'
--- cupstream2distro/settings.py	2013-10-11 07:31:44 +0000
+++ cupstream2distro/settings.py	2013-11-19 19:29:35 +0000
@@ -65,5 +65,5 @@
 STACK_STARTED_FILENAME = "stack.started"
 STACK_BUILDING_FILENAME = "stack.building"
 
-STACK_RUNNING_DIR = "/var/lib/jenkins/cu2d/work"
-STACK_STATUS_PUBLISHING_DIR = "/var/lib/jenkins/cu2d/result_publishing"
+STACK_RUNNING_DIR = "/iSCSI/jenkins/cu2d/work"
+STACK_STATUS_PUBLISHING_DIR = "/iSCSI/jenkins/cu2d/result_publishing"
 
=== modified file 'latest_autopilot_results'
--- latest_autopilot_results	2013-08-09 09:44:17 +0000
+++ latest_autopilot_results	2013-11-19 19:29:35 +0000
@@ -1,25 +1,27 @@
 #!/bin/sh
 
-if [ $# -lt 2 ]; then
+if [ $# -ne 3 ]; then
    cat>&2 <<EOF
-usage: $(basename $0) JOBNAME NODENAME
+usage: $(basename $0) JENKINSROOT JOBNAME NODENAME
 Returns the path to the junit result file of latest build of autopilot
 
 Arguments:
+   JENKINSROOT : Root of the jenkins directory
    JOBNAME  : Name of the job that runs the check
    NODENAME : Name of the jenkins node on which this test has run e.g autopilot-ati
 
 example:
-  \$ $(basename $0) autopilot-raring-daily_release autopilot-intel
+  \$ $(basename $0) /iSCSI/jenkins autopilot-raring-daily_release autopilot-intel
 EOF
 
     exit 1
 fi
 
-JOBNAME=$1
-NODENAME=$2
+JENKINSROOT=$1
+JOBNAME=$2
+NODENAME=$3
 
-BASEDIR=/var/lib/jenkins/jobs
+BASEDIR=${JENKINSROOT}/jobs
 SEARCHPATH=${BASEDIR}/${JOBNAME}/configurations/axis-label/${NODENAME}/builds/
 RESULTFILE=junitResult.xml
 if [ ! -d "$SEARCHPATH" ]; then
 
=== modified file 'stack_status'
--- stack_status	2013-04-12 09:55:15 +0000
+++ stack_status	2013-11-19 19:29:35 +0000
@@ -28,6 +28,7 @@
 import xml.etree.ElementTree as etree
 import sys
 
+JENKINS_ROOT_DEFAULT = '/iSCSI/jenkins'
 
 class CU2DStackStatus(object):
     ''' This class search the latest results and each step and report the global
@@ -41,7 +42,7 @@
         self.stack = self.args.stack
         self.release = self.args.release
 
-        self.jenkinsdir = '/var/lib/jenkins'
+        self.jenkinsdir = self.args.jenkins_root
         self.jobs = ('1.0prepare', '2.1build', '2.2check', '3.0publish')
         self.statuses = ('NA', 'SUCCESS', 'UNSTABLE', 'ABORTED', 'FAILURE')
         self.jobformat = 'cu2d-{}-{}-{}'
@@ -62,6 +63,10 @@
                             help='name of the stack')
         parser.add_argument('-r', '--release',
                             help='name of the release (default: head)')
+        parser.add_argument('-j', '--jenkins-root',
+                            default=JENKINS_ROOT_DEFAULT,
+                            help='jenkins root directory (default: {}'.format(
+                                JENKINS_ROOT_DEFAULT)
         args = parser.parse_args()
         set_logging(args.debug)
         logging.debug(args)