Merge lp:~sil2100/ubuntu-cdimage/ubuntu-touch-custom into lp:ubuntu-cdimage

[Łukasz Zemczak]

Add a new side-project called ubuntu-touch-custom for separate customized re-builds of ubuntu-touch. This is to be a separate project we could use besides the main ubuntu-touch so that we can handle emergency builds or OTA re-spins without occupying the usual ubuntu-touch builders and locations.

Add a new side-project called ubuntu-touch-custom for separate customized re-builds of ubuntu-touch. This is to be a separate project we could use besides the main ubuntu-touch so that we can handle emergency builds or OTA re-spins without occupying the usual ubuntu-touch builders and locations.

I discussed this idea with both infinity and slangasek and they said it would be feasible to have something like this. It would simplify our OTA ubuntu-touch release process a lot.

[Łukasz Zemczak (sil2100)]

Let me merge this in. In case there are any objections, please revert it if needed.

=== modified file 'etc/default-arches'
--- etc/default-arches	2016-06-13 13:41:46 +0000
+++ etc/default-arches	2016-06-29 13:57:55 +0000
@@ -7,6 +7,8 @@
 ubuntu-touch		daily-preinstalled	trusty-			armhf i386
 ubuntu-touch		daily-preinstalled	ubuntu-rtm/*		armhf i386
 
+ubuntu-touch-custom	daily-preinstalled	trusty-			armhf i386
+
 ubuntu			daily-preinstalled	oneiric			armel+ac100 armel+mx5 armel+omap armel+omap4
 ubuntu			daily-preinstalled	raring			armhf+nexus7
 lubuntu			daily-preinstalled	quantal-saucy		armhf+ac100

=== modified file 'etc/purge-days'
--- etc/purge-days	2016-06-13 13:41:46 +0000
+++ etc/purge-days	2016-06-29 13:57:55 +0000
@@ -8,6 +8,7 @@
 ubuntu-mid 3
 ubuntu-netbook 3
 ubuntu-touch 7
+ubuntu-touch-custom 7
 source 1
 wubi 1
 ubuntu-zh_CN 3

=== modified file 'etc/qa-products'
--- etc/qa-products	2016-06-13 13:41:46 +0000
+++ etc/qa-products	2016-06-29 13:57:55 +0000
@@ -82,6 +82,10 @@
 Ubuntu Touch armhf							ubuntu-touch	daily-preinstalled	preinstalled-touch		armhf			iso
 Ubuntu Touch i386							ubuntu-touch	daily-preinstalled	preinstalled-touch		i386			iso
 
+# Ubuntu Touch Custom
+Ubuntu Touch Custom armhf					ubuntu-touch-custom	daily-preinstalled	preinstalled-touch	armhf			iso
+Ubuntu Touch Custom i386					ubuntu-touch-custom	daily-preinstalled	preinstalled-touch	i386			iso
+
 # Ubuntu CPC
 Ubuntu CPC armhf+raspi2                 ubuntu-cpc       daily-preinstalled  preinstalled-server      armhf+raspi2           iso
 

=== modified file 'lib/cdimage/build.py'
--- lib/cdimage/build.py	2016-06-13 13:41:46 +0000
+++ lib/cdimage/build.py	2016-06-29 13:57:55 +0000
@@ -485,7 +485,8 @@
             shutil.copy2(
                 "%s.manifest" % live_prefix, "%s.manifest" % output_prefix)
 
-    if (config.project in ("ubuntu-core", "ubuntu-base", "ubuntu-touch") or
+    if (config.project in ("ubuntu-core", "ubuntu-base", "ubuntu-touch",
+                           "ubuntu-touch-custom") or
         (config.project == "ubuntu-desktop-next" and
          config.subproject == "system-image")):
         log_marker("Copying images to debian-cd output directory")
@@ -506,7 +507,7 @@
                 elif config.project == "ubuntu-base":
                     output_prefix = os.path.join(
                         output_dir, "%s-base-%s" % (config.series, arch))
-                elif config.project == "ubuntu-touch":
+                elif config.project in ("ubuntu-touch", "ubuntu-touch-custom"):
                     output_prefix = os.path.join(
                         output_dir,
                         "%s-preinstalled-touch-%s" % (config.series, arch))
@@ -525,7 +526,7 @@
                     print("tar archive", file=f)
                 shutil.copy2(
                     "%s.manifest" % live_prefix, "%s.manifest" % output_prefix)
-                if config.project == "ubuntu-touch":
+                if config.project in ("ubuntu-touch", "ubuntu-touch-custom"):
                     osextras.link_force(
                         "%s.raw" % output_prefix, "%s.tar.gz" % output_prefix)
                     add_android_support(config, arch, output_dir)
@@ -689,7 +690,7 @@
     live_fs_only = False
     if config.project in (
             "livecd-base", "ubuntu-base", "ubuntu-core", "ubuntu-touch",
-            "ubuntu-cpc"):
+            "ubuntu-touch-custom", "ubuntu-cpc"):
         live_fs_only = True
     elif (config.project == "ubuntu-desktop-next" and
           config.subproject == "system-image"):

=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2016-06-15 07:50:19 +0000
+++ lib/cdimage/livefs.py	2016-06-29 13:57:55 +0000
@@ -121,7 +121,8 @@
         elif subarch in ("ac100", "nexus7"):
             options.extend(["-f", "plain"])
 
-    if (config.project in ("ubuntu-base", "ubuntu-core", "ubuntu-touch") or
+    if (config.project in ("ubuntu-base", "ubuntu-core", "ubuntu-touch",
+                           "ubuntu-touch-custom") or
         (config.project == "ubuntu-desktop-next" and
          config.subproject == "system-image")):
         options.extend(["-f", "plain"])
@@ -944,7 +945,7 @@
         if not got_image:
             raise NoFilesystemImages("No filesystem images found.")
 
-    if config.project == "ubuntu-touch":
+    if config.project in ("ubuntu-touch", "ubuntu-touch-custom"):
         for arch in config.arches:
             for abootimg in (
                 "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch)

=== modified file 'lib/cdimage/project.py'
--- lib/cdimage/project.py	2016-06-14 12:43:40 +0000
+++ lib/cdimage/project.py	2016-06-29 13:57:55 +0000
@@ -54,6 +54,7 @@
     "ubuntu-base": "Ubuntu-Base",
     "ubuntu-touch-preview": "Ubuntu Touch Preview",
     "ubuntu-touch": "Ubuntu Touch",
+    "ubuntu-touch-custom": "Ubuntu Touch Custom Build",
     "ubuntu-cpc": "Ubuntu Server",
     "tocd3": "TheOpenCDv3",
     "tocd3.1": "TheOpenCDv3.1",

=== modified file 'lib/cdimage/tests/test_build.py'
--- lib/cdimage/tests/test_build.py	2016-06-13 13:41:46 +0000
+++ lib/cdimage/tests/test_build.py	2016-06-29 13:57:55 +0000
@@ -328,7 +328,8 @@
         ], os.listdir(output_dir))
 
     @mock.patch("cdimage.osextras.fetch")
-    def test_ubuntu_touch(self, mock_fetch):
+    def _perform_ubuntu_touch_testing(self, project, mock_fetch):
+        '''Convenience function for testing ubuntu-touch* builds.'''
         def fetch_side_effect(config, source, target):
             if (target.endswith(".manifest") or
                     target.endswith(".rootfs.tar.gz") or
@@ -340,7 +341,7 @@
 
         mock_fetch.side_effect = fetch_side_effect
         self.config["CDIMAGE_PREINSTALLED"] = "1"
-        self.config["PROJECT"] = "ubuntu-touch"
+        self.config["PROJECT"] = project
         self.config["DIST"] = "saucy"
         self.config["IMAGE_TYPE"] = "daily-preinstalled"
         self.config["ARCHES"] = "armhf"
@@ -353,7 +354,7 @@
             self.epoch_date,
         ])
         output_dir = os.path.join(
-            self.temp_dir, "scratch", "ubuntu-touch", "saucy",
+            self.temp_dir, "scratch", project, "saucy",
             "daily-preinstalled", "debian-cd", "armhf")
         self.assertTrue(os.path.isdir(output_dir))
         touch_files = ["saucy-preinstalled-boot-%s+%s.img" % (
@@ -387,6 +388,12 @@
             self.assertTrue(os.path.exists(
                 os.path.join(output_dir, recovery_img)))
 
+    def test_ubuntu_touch(self):
+        self._perform_ubuntu_touch_testing("ubuntu-touch")
+
+    def test_ubuntu_touch_custom(self):
+        self._perform_ubuntu_touch_testing("ubuntu-touch-custom")
+
     @mock.patch("cdimage.osextras.fetch")
     def test_ubuntu_desktop_next_system_image(self, mock_fetch):
         def fetch_side_effect(config, source, target):

=== modified file 'lib/cdimage/tests/test_livefs.py'
--- lib/cdimage/tests/test_livefs.py	2016-06-13 13:41:46 +0000
+++ lib/cdimage/tests/test_livefs.py	2016-06-29 13:57:55 +0000
@@ -361,6 +361,11 @@
         self.assertEqual(
             ["-f", "plain"], live_build_options(self.config, "armhf"))
 
+    def test_ubuntu_touch_custom(self):
+        self.config["PROJECT"] = "ubuntu-touch-custom"
+        self.assertEqual(
+            ["-f", "plain"], live_build_options(self.config, "armhf"))
+
     def test_wubi(self):
         self.config["SUBPROJECT"] = "wubi"
         for series, fstype in (

=== modified file 'lib/cdimage/tests/test_tree.py'
--- lib/cdimage/tests/test_tree.py	2016-06-14 12:46:35 +0000
+++ lib/cdimage/tests/test_tree.py	2016-06-29 13:57:55 +0000
@@ -257,6 +257,8 @@
              "preinstalled-desktop"),
             ("daily-preinstalled", "ubuntu-touch", "saucy",
              "preinstalled-touch"),
+            ("daily-preinstalled", "ubuntu-touch-custom", "vivid",
+             "preinstalled-touch"),
             ("daily-preinstalled", "ubuntu-cpc", "xenial",
              "preinstalled-server"),
             ("daily-live", "edubuntu", "edgy", "live"),
@@ -1247,6 +1249,15 @@
                 "ubuntu-touch", "daily-preinstalled", "preinstalled-touch",
                 "armhf"))
 
+    def test_qa_product_ubuntu_touch_custom(self):
+        publisher = self.make_publisher(
+            "ubuntu-touch-custom", "daily-preinstalled")
+        self.assertEqual(
+            ("Ubuntu Touch Custom armhf", "iso"),
+            publisher.qa_product(
+                "ubuntu-touch-custom", "daily-preinstalled",
+                "preinstalled-touch", "armhf"))
+
     def test_qa_product_ubuntu_preinstalled(self):
         publisher = self.make_publisher("ubuntu", "daily")
         self.assertEqual(

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2016-06-13 13:41:46 +0000
+++ lib/cdimage/tree.py	2016-06-29 13:57:55 +0000
@@ -381,7 +381,7 @@
                 return "preinstalled-server"
             elif self.project == "ubuntu-cpc":
                 return "preinstalled-server"
-            elif self.project == "ubuntu-touch":
+            elif self.project in ("ubuntu-touch", "ubuntu-touch-custom"):
                 return "preinstalled-touch"
             elif self.project == "ubuntu-core":
                 return "preinstalled-core"
@@ -1540,7 +1540,7 @@
             if got_iso or got_img:
                 print(file=header)
 
-            if self.config.project == "ubuntu-touch":
+            if self.config.project in ("ubuntu-touch", "ubuntu-touch-custom"):
                 for tag in self.ubuntu_touch_legal_notice():
                     print(tag, file=header)
                 print(file=header)
@@ -2202,11 +2202,13 @@
             for arch in arches:
                 if image_base.endswith("-%s" % arch):
                     matches = True
-                elif (self.config.project == "ubuntu-touch" and
+                elif (self.config.project in ("ubuntu-touch",
+                                              "ubuntu-touch-custom") and
                       arch == "armhf" and
                       ("-armel+" in image_base or "-armhf+" in image_base)):
                     matches = True
-                elif (self.config.project == "ubuntu-touch" and
+                elif (self.config.project in ("ubuntu-touch",
+                                              "ubuntu-touch-custom") and
                       arch == "i386" and "-i386+" in image_base):
                     matches = True
                 elif self.config.subproject == "wubi" and image_base == arch: