Merge lp:~doanac/ubuntu-test-cases/apt-get-update-rerun into lp:ubuntu-test-cases/touch

[Andy Doan]

This adds support for a new "rerun" job. This job is identical to our smoke job except:

 * it doesn't publish results (or do live streaming)
 * it has an option, APT_GET_UPDATE, to allow running apt-get update after provisioning the device.

[Paul Larson (pwlars)]

I think we need a parameter for revision also, and if specified we also pass --revison {rev} in IMAGE_OPTS

Was none of the xml in the rerun job something we could import from other template blocks? If not, fine. I was just wondering.

Also, I'm not sure we want to publish these anywhere on the dashboard do we?

[Andy Doan (doanac)]

On 02/26/2014 01:20 PM, Paul Larson wrote:
> I think we need a parameter for revision also, and if specified we also pass --revison {rev} in IMAGE_OPTS

I was thinking we could use the existing INSTALL_URL feature for that.
Is that okay, or should we try and add functionality for --rev (its not
currently supported in provision.sh)

> Was none of the xml in the rerun job something we could import from other template blocks? If not, fine. I was just wondering.

we don't really have template blocks for the smoke job anymore. maybe
its worth copying, but i thought it would be easier to prevent mistakes
this way (ie, not accidententally streaming live results to the dashboard).

> Also, I'm not sure we want to publish these anywhere on the dashboard do we?

The rerun template doesn't do any publishing.

Unmerged revisions

194. By Andy Doan on 2014-02-26

add a new "re-run" job

This job will show up like the smoke-daily, but have rerun on the end.
Its a non-publishing job and also includes an option to run
"apt-get upate" after provisioning the device.

193. By Andy Doan on 2014-02-26

provide a mechanism to perform apt-get update after provisioning device

We have a need for some one-off testing where an apt-get update call
is required.

=== modified file 'jenkins/production.py'
--- jenkins/production.py	2014-02-24 21:43:03 +0000
+++ jenkins/production.py	2014-02-26 19:13:48 +0000
@@ -31,6 +31,7 @@
     {
         'image-type': 'touch',
         'include-qa': True,
+        'include-rerun': True,
         'dashboard-host': 'ci.ubuntu.com',
         'dashboard-port': '80',
         'dashboard-user': 'doanac',

=== modified file 'jenkins/setup_jenkins.py'
--- jenkins/setup_jenkins.py	2014-01-10 00:22:13 +0000
+++ jenkins/setup_jenkins.py	2014-02-26 19:13:48 +0000
@@ -179,6 +179,27 @@
     return job
 
 
+def _configure_rerun_job(instance, env, args, config_item, device):
+    defserial = '$(${BZRDIR}/scripts/get-adb-id ${NODE_NAME})'
+
+    params = {
+        'name': device['slave-label'],
+        'serial': device.get('serial', defserial),
+        'branch': args.branch,
+        'imagetype': config_item['image-type'],
+        'image_opt': config_item.get('IMAGE_OPT', ''),
+    }
+
+    prefix = ""
+    if(args.prefix):
+        prefix = args.prefix + "-"
+
+    job = '{}{}-{}-{}-smoke-daily-rerun'.format(
+        prefix, args.series, config_item['image-type'], device['name'])
+    _publish(
+        instance, env, args, 'touch-smoke-rerun.xml.jinja2', job, **params)
+
+
 def _dryrun_func(jobname, config):
     logging.debug(jobname)
     logging.debug(config)
@@ -209,5 +230,8 @@
                     jenkins_inst, env, args, item, device)
             _configure_master(jenkins_inst, env, args, item, device, job, jobs)
 
+            if item.get('include-rerun'):
+                _configure_rerun_job(jenkins_inst, env, args, item, device)
+
 if __name__ == '__main__':
     main()

=== added file 'jenkins/templates/touch-smoke-rerun.xml.jinja2'
--- jenkins/templates/touch-smoke-rerun.xml.jinja2	1970-01-01 00:00:00 +0000
+++ jenkins/templates/touch-smoke-rerun.xml.jinja2	2014-02-26 19:13:48 +0000
@@ -0,0 +1,123 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>
+<![CDATA[
+This job provides a flexible way to execute a one-off non-published rerun
+of a daily image.
+The job is parameterized to give flexibility in what gets tested. A couple of
+common ways to run this job are:
+<dl>
+  <dt>Full Test Run</dt>
+  <dd>TESTS=ALL</dd>
+  <dd>APPS=ALL</dd>
+  <dd>PACKAGES=ALL</dd>
+  <dd>APT_GET_UPDATE=1</dd>
+  <dt>Re-run a Failed Autopilot Test</dt>
+  <dd>INSTALL_URL=http://dev-jenkins:8080/job/saucy-touch_ro-mako/9</dd>
+  <dd>APPS=friends_app</dd>
+  <dt>Re-run a Failed UTAH Test</dt>
+  <dd>INSTALL_URL=http://dev-jenkins:8080/job/saucy-touch_ro-mako/9</dd>
+  <dd>TESTS=security</dd>
+</dl>
+<pre>
+#NOTE: Automatically created from a script as part of daily smoke testing
+  {{branch}}
+</pre>
+]]>
+  </description>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>INSTALL_URL</name>
+          <description>A URL to the previous job. If provided this job will use the same install options as it used. If the device executing the job happens to have the exact same image, then provisioning can be skipped.
+	  </description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+	<hudson.model.StringParameterDefinition>
+          <name>APT_GET_UPDATE</name>
+          <description>run apt-get update after provisioning the device
+	  </description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>TESTS</name>
+          <description>A space separated list of utah tests to run. "ALL" can be used to run all known utah tests.
+	  </description>
+          <defaultValue>ALL</defaultValue>
+        </hudson.model.StringParameterDefinition>
+	<hudson.model.StringParameterDefinition>
+          <name>APPS</name>
+          <description>A space separated list of autopilot tests to run. "ALL" can be used to run all known tests.
+	  </description>
+          <defaultValue>ALL</defaultValue>
+        </hudson.model.StringParameterDefinition>
+	<hudson.model.StringParameterDefinition>
+          <name>PACKAGES</name>
+          <description>A space separated list of packages required by autopilot tests. "ALL" can be used to install all known packages required.
+	  </description>
+          <defaultValue>ALL</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <com.sonyericsson.rebuild.RebuildSettings>
+      <autoRebuild>false</autoRebuild>
+    </com.sonyericsson.rebuild.RebuildSettings>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>{{ name }}</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>set -e
+BRANCH=&quot;{{branch}}&quot;
+BZRDIR=`echo &quot;$BRANCH&quot; | awk -F/ &apos;{ print $(NF) }&apos;`
+BZRDIR=$(readlink -f $BZRDIR)
+[ -d $BZRDIR ] &amp;&amp; rm -rf $BZRDIR
+bzr branch ${BRANCH} ${BZRDIR}
+
+export ANDROID_SERIAL={{serial}}
+export IMAGE_TYPE={{imagetype}}
+
+{{image_opt}}
+${BZRDIR}/scripts/run-smoke
+      </command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>clientlogs/**</artifacts>
+      <latestOnly>false</latestOnly>
+    </hudson.tasks.ArtifactArchiver>
+    <hudson.tasks.junit.JUnitResultArchiver>
+      <testResults>clientlogs/**/*.xml</testResults>
+      <keepLongStdio>true</keepLongStdio>
+      <testDataPublishers>
+        <hudson.plugins.junitattachments.AttachmentPublisher/>
+      </testDataPublishers>
+    </hudson.tasks.junit.JUnitResultArchiver>
+    <hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
+      <regexp>^= TOUCH IMAGE VERSION:([0-9]+.*)</regexp>
+      <regexpForFailed>^= TOUCH IMAGE VERSION:([0-9]+.*)</regexpForFailed>
+      <setForMatrix>false</setForMatrix>
+    </hudson.plugins.descriptionsetter.DescriptionSetterPublisher>
+  </publishers>
+  <buildWrappers>
+      <hudson.plugins.build__timeout.BuildTimeoutWrapper>
+          <timeoutMinutes>300</timeoutMinutes>
+      <failBuild>true</failBuild>
+      <writingDescription>false</writingDescription>
+      <timeoutPercentage>0</timeoutPercentage>
+      <timeoutType>absolute</timeoutType>
+      <timeoutMinutesElasticDefault>3</timeoutMinutesElasticDefault>
+    </hudson.plugins.build__timeout.BuildTimeoutWrapper>
+  </buildWrappers>
+</project>
+

=== modified file 'scripts/assert-image'
--- scripts/assert-image	2014-02-10 16:18:04 +0000
+++ scripts/assert-image	2014-02-26 19:13:48 +0000
@@ -24,5 +24,9 @@
 	echo $REQUIRED_UUID > clientlogs/.ci-uuid
 	curl ${INSTALL_URL}/artifact/clientlogs/.ci-flash-args > clientlogs/.ci-flash-args
 	curl ${INSTALL_URL}/artifact/clientlogs/.ci-customizations > clientlogs/.ci-customizations
+	if [ -n "$APT_GET_UPDATE" ] ; then
+		echo "= RUNNING apt-get update on target"
+		adb shell apt-get update
+	fi
 fi
 

=== modified file 'scripts/provision.sh'
--- scripts/provision.sh	2014-02-25 02:52:34 +0000
+++ scripts/provision.sh	2014-02-26 19:13:48 +0000
@@ -26,6 +26,7 @@
   -P    add the ppa to the target (can be repeated)
   -p    add the package to the target (can be repeated)
   -w    make the system writeable (implied with -p and -P arguments)
+  -u    perform "apt-get update" after provisioning
 
 EOF
 }
@@ -53,7 +54,7 @@
 	echo = $(date): $*
 }
 
-while getopts i:s:n:P:p:wh opt; do
+while getopts i:s:n:P:p:wuh opt; do
 	case $opt in
 	h)
 		usage
@@ -78,6 +79,9 @@
 	p)
 		CUSTOMIZE="$CUSTOMIZE -p $OPTARG"
 		;;
+	u)
+		APT_GET_UPDATE=1
+		;;
 	esac
 done
 
@@ -129,3 +133,8 @@
         # Make sure whoopsie-upload-all can work (bug #1245524)
         adb shell "sed -i '/Waiting for whoopsie/ a\    subprocess.call([\"restart\", \"whoopsie\"])' /usr/share/apport/whoopsie-upload-all"
 fi
+
+if [ -n "$APT_GET_UPDATE" ] ; then
+	log "RUNNING apt-get update on target"
+	adb shell apt-get update
+fi

=== modified file 'scripts/run-smoke'
--- scripts/run-smoke	2014-02-07 23:05:01 +0000
+++ scripts/run-smoke	2014-02-26 19:13:48 +0000
@@ -77,6 +77,9 @@
                         help='''Image type being tested. This can be changed
                         to 'touch_sf4p' so that SurfaceFlinger will be used
                         instead of Mir. default=%(default)s''')
+    parser.add_argument('--apt-get-update', '-u', action='store_true',
+                        help='''Perform and apt-get update after provisioning
+                        the device.''')
     return parser
 
 
@@ -103,6 +106,7 @@
     _arg_from_env(args, 'image_opt', 'IMAGE_OPT', False)
     _arg_from_env(args, 'image_type', 'IMAGE_TYPE', False)
     _arg_from_env(args, 'install_url', 'INSTALL_URL', False)
+    _arg_from_env(args, 'apt_get_update', 'APT_GET_UPDATE', False)
 
 
 def _assert_args(args):
@@ -181,6 +185,8 @@
 def _assert_image(args):
     log.info('checking if device has proper image ...')
     os.environ['INSTALL_URL'] = args.install_url
+    if args.apt_get_update:
+        os.environ['APT_GET_UPDATE'] = '1'
     _run([os.path.join(script_dir, 'assert-image')])
 
 
@@ -251,6 +257,8 @@
 
     cargs = [os.path.join(script_dir, 'provision.sh'), '-i', args.image_type]
 
+    if args.apt_get_update:
+        cargs.append('-u')
     if args.package:
         for p in args.package:
             cargs.extend(['-p', p])