Merge lp:~rvb/gwacl/exclude-daily into lp:gwacl

[Raphaël Badin]

Exclude daily builds from the list of images we are using.

While debugging something today with smoser I found that gwacl is using daily images instead of released images. This is due to the fact that, when GetLatestUbuntuImage() was written, only released versions of Ubuntu where present in Azure.

In the long run, GetLatestUbuntuImage() might be replaced by simplestreams but in the meantime, we're stuck with the list of images that Azure gives us.

This branch changes GetLatestUbuntuImage() so that it won't pick daily builds and thus pick released images.

[Gavin Panella (allenap)]

Looks good.

[1]

+func (suite *xmlSuite) TestIsDailyBuild(c *C) {
+    var testValues = []struct {
+        image          *OSImage
+        expectedResult bool
+    }{
+        {&OSImage{Label: "Ubuntu Server 12.04.2 LTS DAILY"}, true},
+        {&OSImage{Label: "Ubuntu Server 12.04.2 LTS"}, false},
+        {&OSImage{Label: "Ubuntu Server 13.04"}, false},
+    }
+    for _, test := range testValues {
+        c.Check(test.image.isDailyBuild(), Equals, test.expectedResult)
+    }
+}

Go's typing boilerplate makes this much longer and less readable than
doing it the stupid way:

func (suite *xmlSuite) TestIsDailyBuild(c *C) {
    c.Check(OSImage{Label: "Ubuntu Server 12.04.2 LTS DAILY"}.isDailyBuild(), Equals, true)
    c.Check(OSImage{Label: "Ubuntu Server 12.04.2 LTS"}.isDailyBuild(), Equals, false),
    c.Check(OSImage{Label: "Ubuntu Server 13.04"}.isDailyBuild(), Equals, false),
}

review: Approve

[lp:~rvb/gwacl/exclude-daily]

143. By Raphaël Badin on 2013-06-27

Simplify tests.

[Raphaël Badin (rvb)]

> Looks good.
>
>
> [1]
>
> +func (suite *xmlSuite) TestIsDailyBuild(c *C) {
> +    var testValues = []struct {
> +        image          *OSImage
> +        expectedResult bool
> +    }{
> +        {&OSImage{Label: "Ubuntu Server 12.04.2 LTS DAILY"}, true},
> +        {&OSImage{Label: "Ubuntu Server 12.04.2 LTS"}, false},
> +        {&OSImage{Label: "Ubuntu Server 13.04"}, false},
> +    }
> +    for _, test := range testValues {
> +        c.Check(test.image.isDailyBuild(), Equals, test.expectedResult)
> +    }
> +}
>
> Go's typing boilerplate makes this much longer and less readable than
> doing it the stupid way:
>
> func (suite *xmlSuite) TestIsDailyBuild(c *C) {
>    c.Check(OSImage{Label: "Ubuntu Server 12.04.2 LTS DAILY"}.isDailyBuild(),
> Equals, true)
>    c.Check(OSImage{Label: "Ubuntu Server 12.04.2 LTS"}.isDailyBuild(),
> Equals, false),
>    c.Check(OSImage{Label: "Ubuntu Server 13.04"}.isDailyBuild(), Equals,
> false),
> }

Okay, thanks for the review.

=== modified file 'xmlobjects.go'
--- xmlobjects.go	2013-06-27 11:53:50 +0000
+++ xmlobjects.go	2013-06-27 16:18:34 +0000
@@ -123,10 +123,10 @@
     return dateI.After(dateJ)
 }
 
-// GetLatestUbuntuImage returns the most recent available OSImage, for the given release name
-// and location.  The 'releaseName' parameter is the Ubuntu version number
-// present in the 'ImageFamily' tag present in Azure's representation of an OS Image
-// (e.g. '12.04', '12.10').
+// GetLatestUbuntuImage returns the most recent released available OSImage,
+// for the given release name and location.  The 'releaseName' parameter is
+// the Ubuntu version number present in the 'ImageFamily' tag present in 
+// Azure's representation of an OS Image (e.g. '12.04', '12.10').
 func (images *Images) GetLatestUbuntuImage(releaseName string, location string) (image *OSImage, err error) {
     // The Less method defined above can panic if one of the published dates cannot be parsed,
     // this code recovers from that and transforms that into an error.
@@ -141,7 +141,8 @@
     for _, image := range images.Images {
         if image.PublisherName == canonicalPublisherName &&
             matcherRegexp.MatchString(image.ImageFamily) &&
-            image.hasLocation(location) {
+            image.hasLocation(location) &&
+            !image.isDailyBuild() {
             matchingImages.Images = append(matchingImages.Images, image)
         }
     }
@@ -192,6 +193,11 @@
     return false
 }
 
+// isDailyBuild returns whether this image is a daily build.
+func (image *OSImage) isDailyBuild() bool {
+    return strings.Contains(image.Label, "DAILY")
+}
+
 func (i *OSImage) Deserialize(data []byte) error {
     return xml.Unmarshal(data, i)
 }

=== modified file 'xmlobjects_test.go'
--- xmlobjects_test.go	2013-06-27 11:53:50 +0000
+++ xmlobjects_test.go	2013-06-27 16:18:34 +0000
@@ -1246,6 +1246,12 @@
     }
 }
 
+func (suite *xmlSuite) TestIsDailyBuild(c *C) {
+    c.Check((&OSImage{Label: "Ubuntu Server 12.04.2 LTS DAILY"}).isDailyBuild(), Equals, true)
+    c.Check((&OSImage{Label: "Ubuntu Server 12.04.2 LTS"}).isDailyBuild(), Equals, false)
+    c.Check((&OSImage{Label: "Ubuntu Server 13.04"}).isDailyBuild(), Equals, false)
+}
+
 func (suite *xmlSuite) TestSortImages(c *C) {
     input := `
 <?xml version="1.0"?>
@@ -1312,6 +1318,17 @@
   </OSImage>
   <OSImage>
     <Category>Canonical</Category>
+    <Label>Ubuntu Server 13.04 DAILY</Label>
+    <Location>East Asia;Southeast Asia;North Europe;West Europe;East US;West US</Location>
+    <LogicalSizeInGB>30</LogicalSizeInGB>
+    <Name>fake-name__Ubuntu-13_04-amd64-server-20130423-en-us-30GB</Name>
+    <OS>Linux</OS>
+    <ImageFamily>Ubuntu Server 13.04</ImageFamily>
+    <PublishedDate>2013-06-25T00:00:00Z</PublishedDate>
+    <PublisherName>Canonical</PublisherName>
+  </OSImage>
+  <OSImage>
+    <Category>Canonical</Category>
     <Label>Ubuntu Server 13.04</Label>
     <Location>East Asia;Southeast Asia;North Europe;West Europe;East US;West US</Location>
     <LogicalSizeInGB>30</LogicalSizeInGB>