Merge lp:~psivaa/utah/upgrade-setup-jobs into lp:~utah/utah/jenkins-upgradetest-setup

[Para Siva]

This is to give *some flexibility to create upgrade jobs from any base release to the dev release. This cycle being lts, we need jobs from precise. Tried locally and was able to create jobs without issues.

This also includes the timeout change to 3 hrs. So this could supersede, https://code.launchpad.net/~psivaa/utah/upgrade-timeout/+merge/193572

[Andy Doan (doanac)]

There's nothing wrong with this:

105 + epilog=("For example:\n"
106 + "\t%(prog)s -b /path/to/branch"
107 + " -u user -p pass -j http://jenkins:8080"
108 + " -B saucy"
109 + " -D trusty\n"),

However, python has textwrap.dedent which would make this look a little nicer like:

  epilog=('''For example:\n
          t%(prog)s -b /path/to/branch
            -u user -p pass -j http://jenkins:8080
            -B saucy
            -D trusty'''),

[Andy Doan (doanac)]

I'm not a huge fan of how permutations was changed. Seems like it makes it easier to screw something up with a typo. We moved away from a similar approach in lp:ubuntu-test-cases/touch.

I have no objections if you like this way more though.

[Paul Larson (pwlars)]

What's up with main and universe? I know they take some additional hand-holding to get up and running, but I don't like commenting them out from the setup script. Default should be that they are ON, and if we need to work around them temporarily, that's fine. But I'm afraid if they are just commented out in the setup script, then they could be too easily forgotten in the future.

[lp:~psivaa/utah/upgrade-setup-jobs]

31. By Para Siva on 2013-11-03

Review comment fixes including using matrices

32. By Para Siva on 2013-11-04

Keeping local host as the default jenkins

[Para Siva (psivaa)]

Thanks for the comments, I've tried fixing the concerns in them. I have included to use explicit matrices for each type of upgrade jobs and that includes main and universe as well. Making the main and universe work still needs to be done in terms of creating the base install properly. That will be time consuming but that's on the list.

Note: I have not included a README, but that i'll do after doing some higher priority tasks.

Could you please look at the changes again. Thanks.

review: Needs Resubmitting

[Paul Larson (pwlars)]

Looks good, assuming you've tried it and jenkins doesn't complain.

review: Approve

[Para Siva (psivaa)]

Thanks Paul. Yes I was able to create jobs in jiufeng.

=== modified file 'jenkins/config.xml.jinja2'
--- jenkins/config.xml.jinja2	2013-05-30 19:48:23 +0000
+++ jenkins/config.xml.jinja2	2013-11-04 10:17:11 +0000
@@ -19,7 +19,6 @@
       <throttleEnabled>false</throttleEnabled>
       <throttleOption>project</throttleOption>
     </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
-    <hudson.plugins.build__publisher.ExternalProjectProperty/>
   </properties>
   <scm class="hudson.scm.NullSCM"/>
   <assignedNode>{{node}}</assignedNode>
@@ -27,7 +26,9 @@
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
   <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers class="vector"/>
+  <triggers class="vector">
+{% block triggers %}{% endblock %}
+  </triggers>
   <concurrentBuild>false</concurrentBuild>
   <builders>
     <hudson.tasks.Shell>
@@ -45,21 +46,40 @@
 export PROVISION_RUNLIST=`pwd`/${BZRDIR}/{{provision_runlist}}
 export RUNLIST=`pwd`/${BZRDIR}/{{runlist}}
 
+PARAMS='-d --name upgrade-{{image_base}}-{{image_arch}}-{{install_type}} --skip-provisioning -n'
+
 rm -rf *
 bzr branch ${BRANCH} ${BZRDIR}
 ${BZRDIR}/jenkins/jenkins.sh
       </command>
     </hudson.tasks.Shell>
+{% block builders %}{% endblock %}
   </builders>
   <publishers>
     <hudson.tasks.ArtifactArchiver>
       <artifacts>**/*</artifacts>
       <latestOnly>false</latestOnly>
     </hudson.tasks.ArtifactArchiver>
+{% if publish %}
     <hudson.plugins.build__publisher.BuildPublisher>
       <publishUnstableBuilds>true</publishUnstableBuilds>
       <publishFailedBuilds>true</publishFailedBuilds>
       <postActions class="vector"/>
     </hudson.plugins.build__publisher.BuildPublisher>
+{% endif %}
+{% block artifacts %}
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>**/*</artifacts>
+      <latestOnly>false</latestOnly>
+    </hudson.tasks.ArtifactArchiver>
+{% endblock %}
+{% block publishers %}{% endblock %}
   </publishers>
+  <buildWrappers>
+    <EnvInjectBuildWrapper>
+      <info>
+        <loadFilesFromMaster>false</loadFilesFromMaster>
+      </info>
+    </EnvInjectBuildWrapper>
+  </buildWrappers>
 </project>

=== added file 'jenkins/production.py'
--- jenkins/production.py	1970-01-01 00:00:00 +0000
+++ jenkins/production.py	2013-11-04 10:17:11 +0000
@@ -0,0 +1,182 @@
+# The configuration matrix of our production device testing
+
+LTS_DESKTOP_MATRIX = [
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'desktop',
+        'install_type': 'desktop',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+    },
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'desktop',
+        'install_type': 'desktop',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+    },
+]
+
+LTS_SERVER_MATRIX = [
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'server',
+        'install_type': 'server',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+    },
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'server',
+        'install_type': 'server',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+
+    },
+]
+
+LTS_MAIN_MATRIX = [
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'server',
+        'install_type': 'main',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'main.run',
+    },
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'mini',
+        'install_type': 'main',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'main.run',
+    },
+]
+
+LTS_UNIVERSE_MATRIX = [
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'mini',
+        'install_type': 'universe',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'universe.run',
+    },
+    {
+        'image_base': 'precise',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'mini',
+        'install_type': 'universe',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'universe.run',
+    },
+]
+
+NON_LTS_DESKTOP_MATRIX = [
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'desktop',
+        'install_type': 'desktop',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+    },
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'desktop',
+        'install_type': 'desktop',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+    },
+]
+
+NON_LTS_SERVER_MATRIX = [
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'server',
+        'install_type': 'server',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+    },
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'server',
+        'install_type': 'server',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'nothing.run',
+    },
+]
+
+NON_LTS_MAIN_MATRIX = [
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'mini',
+        'install_type': 'main',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'main.run',
+    },
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'mini',
+        'install_type': 'main',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'main.run',
+    },
+]
+
+NON_LTS_UNIVERSE_MATRIX = [
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'i386',
+        'image_type': 'mini',
+        'install_type': 'universe',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'universe.run',
+    },
+    {
+        'image_base': 'saucy',
+        'image_dest': 'trusty',
+        'image_arch': 'amd64',
+        'image_type': 'mini',
+        'install_type': 'universe',
+        'runlist': 'upgrade.run',
+        'provision_runlist': 'universe.run',
+    },
+]
+
+
+MATRIX = {
+    'lts_desktop': LTS_DESKTOP_MATRIX,
+    'non_lts_desktop': NON_LTS_DESKTOP_MATRIX,
+    'lts_server': LTS_SERVER_MATRIX,
+    'non_lts_server': NON_LTS_SERVER_MATRIX,
+    'lts_main': LTS_MAIN_MATRIX,
+    'non_lts_main': NON_LTS_MAIN_MATRIX,
+    'lts_universe': LTS_UNIVERSE_MATRIX,
+    'non_lts_universe': NON_LTS_UNIVERSE_MATRIX,
+}

=== modified file 'jenkins/setup_jenkins.py'
--- jenkins/setup_jenkins.py	2013-05-30 19:48:23 +0000
+++ jenkins/setup_jenkins.py	2013-11-04 10:17:11 +0000
@@ -20,51 +20,26 @@
 import jinja2
 import logging
 import os
+import imp
+import sys
 
+from distro_info import UbuntuDistroInfo
 from bzrlib.branch import Branch
 
 
-DESKTOP = 'desktop'
-SERVER = 'server'
-MAIN = 'main'
-UNIVERSE = 'universe'
-
-DEF_RUNLIST = 'upgrade.run'
-PROVISION_RUNLISTS = {
-    DESKTOP: 'nothing.run',
-    SERVER: 'nothing.run',
-    MAIN: 'main.run',
-    UNIVERSE: 'universe.run',
-}
-
-
-def _job(image_base, image_dest, image_type, image_arch, runlist=DEF_RUNLIST):
-    job = {
-        'image_base': image_base,
-        'image_dest': image_dest,
-        'image_type': image_type,
-        'image_arch': image_arch,
-        'install_type': image_type,
-        'runlist': runlist,
-        'provision_runlist': PROVISION_RUNLISTS[image_type]
-    }
-
-    if image_type in (MAIN, UNIVERSE):
-        job['install_type'] = 'mini'
-    return job
-
-
-# this defines all the upgrade permutations we intend to support
-PERMUTATIONS = [
-    _job('raring', 'saucy', DESKTOP,  'amd64'),
-    _job('raring', 'saucy', SERVER,   'amd64'),
-    _job('raring', 'saucy', MAIN,     'amd64'),
-    _job('raring', 'saucy', UNIVERSE, 'amd64'),
-    _job('raring', 'saucy', DESKTOP,  'i386'),
-    _job('raring', 'saucy', SERVER,   'i386'),
-    _job('raring', 'saucy', MAIN,     'i386'),
-    _job('raring', 'saucy', UNIVERSE, 'i386'),
-]
+DEV_SERIES = UbuntuDistroInfo().devel()
+
+LTS_UPGRADE = ['lts_desktop',
+               'lts_server',
+               'lts_main',
+               'lts_universe']
+
+NON_LTS_UPGRADE = ['non_lts_desktop',
+                   'non_lts_server',
+                   'non_lts_main',
+                   'non_lts_universe']
+
+SUPPORTED_UPGRADES = LTS_UPGRADE + NON_LTS_UPGRADE
 
 
 def _get_parser():
@@ -75,22 +50,45 @@
 
     """
     parser = argparse.ArgumentParser(
-        description='Create/Update upgrade testing jenkins jobs.')
+        description=('Create/Update upgrade testing jenkins jobs.'),
+        epilog=('''For example:\n
+                   %(prog)s -b /path/to/branch
+                   -u user -p pass -j http://jenkins:8080
+                   -t upgrade type (lts_desktop or non_lts_main etc.)
+                   -B saucy
+                   -D trusty'''),
+        formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument("-b", "--branches",
+                        help="Path(s) to branch(es) to process")
     parser.add_argument("-d", "--dryrun", action="store_true",
                         help="Dry run mode. Don't execute jenkins commands.")
-    parser.add_argument("-u", "--username",
-                        help="username to use when logging into Jenkins.")
-    parser.add_argument("-p", "--password",
-                        help="username to use when logging into Jenkins")
-    parser.add_argument("-j", "--jenkins", default="http://10.98.0.1:8080/",
-                        help="URL of jenkins instance to configure jobs in.")
+    parser.add_argument("-t", "--type",
+                        help=("Type of upgrade lts or non lts "
+                              "(default=%(default)s)"))
+    group = parser.add_argument_group('authentication arguments')
+    group.add_argument("-u", "--username",
+                       help="Username to use when logging into Jenkins")
+    group.add_argument("-p", "--password",
+                       help="Password to use when logging into Jenkins")
+    parser.add_argument("-j", "--jenkins", default="http://127.0.0.1:8080/",
+                        help="URL of jenkins instance to configure test in")
     parser.add_argument("-n", "--node", default="aldebaran",
                         help=("Jenkins node were the job should be executed "
                               "(default=%(default)s)"))
+    parser.add_argument("-D", "--dest", default=DEV_SERIES,
+                        help=("Destination release to be upgraded to "
+                              "(default=%(default)s)"))
+    parser.add_argument("-B", "--base",
+                        help=("Source release to be upgraded from"
+                              "(default=%(default)s)"))
+    parser.add_argument("--publish", action="store_true",
+                        help=("Publish build results. "
+                              "This is useful to test job changes "
+                              "without overwriting the configuration."))
     return parser
 
 
-def _get_jenkins(url, username, password):
+def _get_jenkins(url, username=None, password=None):
     logging.info('Attempting to login to jenkins at %s', url)
     if username is not None:
         logging.info('...with authentication as user: %s', username)
@@ -98,7 +96,6 @@
     else:
         logging.info('...without authentication')
         instance = jenkins.Jenkins(url)
-
     return instance
 
 
@@ -111,7 +108,7 @@
 
 
 def _get_job_name(job_args):
-    fmt = 'upgrade-{image_base}-{image_arch}-{image_type}-{image_dest}'
+    fmt = 'upgrade-{image_base}-{image_arch}-{install_type}-{image_dest}'
     return fmt.format(**job_args)
 
 
@@ -125,9 +122,12 @@
     return b
 
 
-def _configure_job(instance, env, node, job_args, dryrun):
+def _configure_job(instance, env, node, publish, job_args, dryrun):
     tmpl = env.get_template('config.xml.jinja2')
-    cfg = tmpl.render(node=node, branch=_get_branch(), **job_args)
+    cfg = tmpl.render(node=node,
+                      branch=_get_branch(),
+                      publish=publish,
+                      **job_args)
     jobname = _get_job_name(job_args)
     if instance.job_exists(jobname):
         logging.info('reconfiguring job %s', jobname)
@@ -137,23 +137,35 @@
         instance.create_job(jobname, cfg)
 
 
-def _dryrun_func(jobname, config):
-    logging.debug(config)
-
-
 def main():
     logging.basicConfig(level=logging.DEBUG)
     args = _get_parser().parse_args()
 
-    jenkins_inst = _get_jenkins(args.jenkins, args.username, args.password)
+    # Check to make sure the right releases are intended
+    if args.type in SUPPORTED_UPGRADES and args.dest != 'trusty':
+        logging.debug('Destination release can only be trusty')
+        sys.exit(1)
+    if args.type in LTS_UPGRADE and args.base != 'precise':
+        logging.debug('lts base release can only be precise')
+        sys.exit(1)
+    if args.type in NON_LTS_UPGRADE and args.base != 'saucy':
+        logging.debug('non_lts base release can only be saucy')
+        sys.exit(1)
+
+    instance = _get_jenkins(args.jenkins, args.username, args.password)
+
     if args.dryrun:
-        jenkins_inst.create_job = _dryrun_func
-        jenkins_inst.reconfig_job = _dryrun_func
+        return True
 
     env = _get_environment()
-
-    for job_args in PERMUTATIONS:
-        _configure_job(jenkins_inst, env, args.node, job_args, args.dryrun)
+    config = imp.load_source('', 'production.py')
+    for item in config.MATRIX[args.type]:
+        _configure_job(instance,
+                       env,
+                       args.node,
+                       args.publish,
+                       item,
+                       args.dryrun)
 
 if __name__ == '__main__':
     main()

=== modified file 'upgrade/release_upgrade/tc_control'
--- upgrade/release_upgrade/tc_control	2013-05-30 21:26:26 +0000
+++ upgrade/release_upgrade/tc_control	2013-11-04 10:17:11 +0000
@@ -5,6 +5,6 @@
 expected_results: |
   1. updates to latest development release
 type: userland
-timeout: 36000 # 10 hours
+timeout: 10800 # 3 hours
 command: RELEASE_UPGRADE_NO_FORCE_OVERWRITE=1 do-release-upgrade -d -f DistUpgradeViewNonInteractive
 reboot: pass