Merge lp:~pfalcon/linaro-android-frontend/reset-retention-for-official into lp:linaro-android-frontend

[Paul Sokolovsky]

[James Westby (james-w)]

I'd appreciate a comment in the resetRetentionSettings about what
it's actually doing, as it's not particularly clear why deleting an
element named "logRotator" means that builds aren't deleted.

32 + "You are not allowed to create official build", status=403)

That should be "You are not allowed to create an official build."

Thanks,

James

review: Approve

[Paul Sokolovsky (pfalcon)]

Fixed both.

[lp:~pfalcon/linaro-android-frontend/reset-retention-for-official]

233. By Paul Sokolovsky on 2011-08-24

Grammar fix.

234. By Paul Sokolovsky on 2011-08-24

resetRetentionSettings(): Add comment.

[James Westby (james-w)]

Looks great.

Thanks,

James

review: Approve

=== modified file 'android_build/frontend/api.py'
--- android_build/frontend/api.py	2011-07-02 09:22:17 +0000
+++ android_build/frontend/api.py	2011-08-24 07:48:26 +0000
@@ -100,6 +100,19 @@
     return etree.tostring(doc_root)
 
 
+def resetRetentionSettings(configXml):
+    "Reset retention setting for a job to 'infinite retention'."
+    doc_root = etree.XML(configXml)
+    # Remove <logRotator> element, which corresponds to UI
+    # setting "Discard Old Builds".
+    try:
+        node = doc_root.xpath('//logRotator')[0]
+    except IndexError:
+        return configXml
+    doc_root.remove(node)
+    return etree.tostring(doc_root)
+
+
 def postConfig(url, configXml):
     try:
         _authJenkins(url, configXml, {'Content-Type': 'text/xml'})
@@ -170,10 +183,11 @@
 @builder_required
 def new(request):
     try:
-        if request.POST.get('official', 'false') == 'true':
+        is_official = request.POST.get('official', 'false') == 'true'
+        if is_official:
             if not is_official_builder(request):
                 return HttpResponse(
-                    "You are not allowed to do that", status=403)
+                    "You are not allowed to create an official build", status=403)
             ownerName = 'linaro-android'
         else:
             ownerName = request.user.username
@@ -184,6 +198,8 @@
         xml_base = getJobConfig(settings.TEMPLATE_JOB_NAME)
         if isinstance(xml_base, HttpResponse):
             return xml_base
+        if is_official:
+            xml_base = resetRetentionSettings(xml_base)
         new_config = replaceConfigDefault(xml_base, request.POST['config'])
         resp = postConfig('createItem?name=' + new_job_name, new_config)
         if resp:

=== added directory 'android_build/tests'
=== added file 'android_build/tests/README'
--- android_build/tests/README	1970-01-01 00:00:00 +0000
+++ android_build/tests/README	2011-08-24 07:48:26 +0000
@@ -0,0 +1,3 @@
+To run tests, from top-level dir:
+
+DJANGO_SETTINGS_MODULE=android_build.settings nosetests android_build/tests/ -s

=== added directory 'android_build/tests/data'
=== added file 'android_build/tests/data/discard_builds_config.diff'
--- android_build/tests/data/discard_builds_config.diff	1970-01-01 00:00:00 +0000
+++ android_build/tests/data/discard_builds_config.diff	2011-08-24 07:48:26 +0000
@@ -0,0 +1,15 @@
+---  
++++  
+@@ -1,12 +1,6 @@
+ <project>
+   <actions/>
+   <description/>
+-  <logRotator>
+-    <daysToKeep>30</daysToKeep>
+-    <numToKeep>10</numToKeep>
+-    <artifactDaysToKeep>-1</artifactDaysToKeep>
+-    <artifactNumToKeep>-1</artifactNumToKeep>
+-  </logRotator>
+   <keepDependencies>false</keepDependencies>
+   <properties>
+     <hudson.model.ParametersDefinitionProperty>

=== added file 'android_build/tests/data/discard_builds_config.xml'
--- android_build/tests/data/discard_builds_config.xml	1970-01-01 00:00:00 +0000
+++ android_build/tests/data/discard_builds_config.xml	2011-08-24 07:48:26 +0000
@@ -0,0 +1,46 @@
+<project>
+  <actions/>
+  <description/>
+  <logRotator>
+    <daysToKeep>30</daysToKeep>
+    <numToKeep>10</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>CONFIG</name>
+          <description/>
+          <defaultValue>TUFOSUZFU1RfUkVQTz1naXQ6Ly9odHRwOi8vYW5kcm9pZC5naXQua2VybmVsLm9yZy9wbGF0Zm9ybS9tYW5pZmVzdC5naXQKTUFOSUZFU1RfQlJBTkNIPW1hc3RlcgpUQVJHRVRfUFJPRFVDVD1mdWxsLWVuZw==</defaultValue>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <assignedNode>ec2</assignedNode>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>true</concurrentBuild>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>rm -rf build-tools
+bzr get http://bazaar.launchpad.net/~linaro-infrastructure/linaro-android-build-tools/trunk build-tools
+build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "$CONFIG"
+#build-tools/node/build "$HUDSON_URL" "$CONFIG"
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>build/out/target/*/*/*.img,build/out/target/*/*/*.tar.bz2,build/out/*.tar.bz2,build/out/*.xml,build/out/*.html</artifacts>
+      <latestOnly>false</latestOnly>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers/>
+</project>
\ No newline at end of file

=== added file 'android_build/tests/test_api.py'
--- android_build/tests/test_api.py	1970-01-01 00:00:00 +0000
+++ android_build/tests/test_api.py	2011-08-24 07:48:26 +0000
@@ -0,0 +1,16 @@
+import os
+import difflib
+
+from android_build.frontend import api
+
+datadir = os.path.dirname(__file__) + "/data"
+
+def assert_diff(text1, text2, diff_file):
+    actual_diff = "".join(list(difflib.unified_diff(text1.splitlines(True), text2.splitlines(True))))
+    expected_diff = open(diff_file).read()
+    assert actual_diff == expected_diff
+
+def test_resetRetentionSettings():
+    in_text = open(datadir + "/discard_builds_config.xml").read()
+    out_text = api.resetRetentionSettings(in_text)
+    assert_diff(in_text, out_text, datadir + "/discard_builds_config.diff")