Merge lp:~nuclearbob/utah/boostpeed-no-envinject into lp:utah/utah-bootspeed

[Max Brustkern]

This is a new proposal since I goobed up the old one a bit. This attempts to simplify the diff by recreating some old environment variables in the download template per Andy's suggestion.

[Andy Doan (doanac)]

LGTM

review: Approve

=== modified file 'bootspeed/jenkins/templates/base.xml.jinja'
--- bootspeed/jenkins/templates/base.xml.jinja	2013-05-03 15:49:23 +0000
+++ bootspeed/jenkins/templates/base.xml.jinja	2013-05-24 15:51:28 +0000
@@ -37,6 +37,9 @@
     </hudson.tasks.Shell>
     <hudson.tasks.Shell>
       <command>
+{% block image %}
+IMAGE=/var/cache/utah/iso/{{series}}-{{installtype}}-{{arch}}.iso
+{% endblock %}
 {% block command %}{% endblock %}
       </command>
     </hudson.tasks.Shell>
@@ -70,22 +73,4 @@
   </hudson.plugins.build__publisher.BuildPublisher>
 {% endif %}
   </publishers>
-  <buildWrappers>
-    <EnvInjectBuildWrapper>
-      <info>
-        <propertiesContent>
-TYPE={{installtype}}
-ARCH={{arch}}
-{% if is_parametrized is not defined %}
-SERIES={{series}}
-ISONAME=$SERIES-$TYPE-$ARCH.iso
-ISODIR=/var/cache/utah/iso
-IMAGE=$ISODIR/$ISONAME
-{% endif %}
-{% block properties %}{% endblock %}
-        </propertiesContent>
-        <loadFilesFromMaster>false</loadFilesFromMaster>
-      </info>
-    </EnvInjectBuildWrapper>
-  </buildWrappers>
 </project>

=== modified file 'bootspeed/jenkins/templates/bootspeed.xml.jinja'
--- bootspeed/jenkins/templates/bootspeed.xml.jinja	2013-02-22 16:35:23 +0000
+++ bootspeed/jenkins/templates/bootspeed.xml.jinja	2013-05-24 15:51:28 +0000
@@ -39,4 +39,3 @@
 
 exit $RETCODE
 {% endblock %}
-

=== modified file 'bootspeed/jenkins/templates/download.xml.jinja'
--- bootspeed/jenkins/templates/download.xml.jinja	2013-01-09 21:56:29 +0000
+++ bootspeed/jenkins/templates/download.xml.jinja	2013-05-24 15:51:28 +0000
@@ -16,7 +16,8 @@
 rm $TMPISO
 {% endblock %}
 
-{% block properties %}
-ISOURL={{url}}$SERIES/$ISONAME
-TMPISO=/tmp/$ISONAME
+{% block image %}
+{{ super() }}
+ISOURL={{url}}{{series}}/{{series}}-{{installtype}}-{{arch}}.iso
+TMPISO=/tmp/{{series}}-{{installtype}}-{{arch}}.iso
 {% endblock %}

=== modified file 'bootspeed/jenkins/templates/parametrized.xml.jinja'
--- bootspeed/jenkins/templates/parametrized.xml.jinja	2013-01-09 21:56:29 +0000
+++ bootspeed/jenkins/templates/parametrized.xml.jinja	2013-05-24 15:51:28 +0000
@@ -39,10 +39,8 @@
 {% endif %}
 {% endblock %}
 
-{% block properties %}
+{% block image %}
 {% if backfilldir is defined %}
-IMAGE={{backfilldir}}/$BUILDNUMBER/*-$TYPE-$ARCH.iso
+IMAGE={{backfilldir}}/$BUILDNUMBER/*-{{installtype}}-{{arch}}.iso
 {% endif %}
-{{ super() }}
 {% endblock %}
-

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-20 20:42:19 +0000
+++ debian/changelog	2013-05-24 15:51:28 +0000
@@ -1,3 +1,10 @@
+utah-bootspeed (0.2ubuntu1) UNRELEASED; urgency=low
+
+  * Changed jobs to pull variables from templates instead of using
+    EnvInject for environment variables
+
+ -- Max Brustkern <[e-mail]>  Fri, 24 May 2013 11:07:43 -0400
+
 utah-bootspeed (0.1ubuntu3) precise; urgency=low
 
   * Updated scripts to work with utah as modified for sphinx