Merge ~didrocks/ubiquity:master-fix-oem into ubiquity:master

[Didier Roche-Tolomelli]

Only record OEM config when installing

Don't record telemetry data when doing stage 2 (user mode) as
it keeps an unused /target directory. (LP: #1773321)
Also, record OEM types. (LP: #1765693)

[Didier Roche-Tolomelli (didrocks)]

This was tested with GTK, KDE and debconf UI. Both with OEM and non OEM mode, including stage 2 (oem user mode).

[Jean-Baptiste Lallement (jibel)]

LGTM. Tested successfully on cosmic. Thanks!

review: Approve

diff --git a/ubiquity/frontend/debconf_ui.py b/ubiquity/frontend/debconf_ui.py
index 7ec4d7f..1690ba5 100644
--- a/ubiquity/frontend/debconf_ui.py
+++ b/ubiquity/frontend/debconf_ui.py
@@ -95,6 +95,7 @@ class Wizard(BaseFrontend):
             sys.exit(1)
 
         telemetry.get().set_installer_type('DebConf')
+        telemetry.get().set_is_oem(self.oem_config)
         telemetry.get().add_stage(telemetry.START_INSTALL_STAGE_TAG)
 
         self.pagesindex = 0
diff --git a/ubiquity/frontend/gtk_ui.py b/ubiquity/frontend/gtk_ui.py
index f94cd3b..88608ea 100644
--- a/ubiquity/frontend/gtk_ui.py
+++ b/ubiquity/frontend/gtk_ui.py
@@ -757,6 +757,7 @@ class Wizard(BaseFrontend):
             self.refresh()
 
         telemetry.get().set_installer_type('GTK')
+        telemetry.get().set_is_oem(self.oem_config)
 
         self.set_current_page(0)
         self.live_installer.show()
diff --git a/ubiquity/frontend/kde_ui.py b/ubiquity/frontend/kde_ui.py
index a73c531..2b2c6fc 100644
--- a/ubiquity/frontend/kde_ui.py
+++ b/ubiquity/frontend/kde_ui.py
@@ -455,6 +455,7 @@ class Wizard(BaseFrontend):
             self.refresh()
 
         telemetry.get().set_installer_type('KDE')
+        telemetry.get().set_is_oem(self.oem_config)
 
         # Start the interface
         self.set_current_page(0)
diff --git a/ubiquity/frontend/noninteractive.py b/ubiquity/frontend/noninteractive.py
index c53a400..daee07a 100644
--- a/ubiquity/frontend/noninteractive.py
+++ b/ubiquity/frontend/noninteractive.py
@@ -78,6 +78,7 @@ class Wizard(BaseFrontend):
             sys.exit(1)
 
         telemetry.get().set_installer_type('NonInteractive')
+        telemetry.get().set_is_oem(self.oem_config)
         telemetry.get().add_stage(telemetry.START_INSTALL_STAGE_TAG)
 
         for x in self.pages:
diff --git a/ubiquity/telemetry.py b/ubiquity/telemetry.py
index 7f68eac..da5c6c3 100644
--- a/ubiquity/telemetry.py
+++ b/ubiquity/telemetry.py
@@ -62,6 +62,10 @@ class _Telemetry():
         """Record installer type"""
         self._metrics['Type'] = installer_type
 
+    def set_is_oem(self, is_oem):
+        """Record if OEM installation"""
+        self._metrics['OEM'] = is_oem
+
     def set_partition_method(self, method):
         """Record anynomized partition method"""
         self._metrics['PartitionMethod'] = method
@@ -88,6 +92,11 @@ class _Telemetry():
             db.get('ubiquity/use_nonfree'))
         self._metrics['Stages'] = self._stages_hist
 
+        # don't save oem user config for now. We may merge the 2 installation
+        # records in the future.
+        if 'UBIQUITY_OEM_USER_CONFIG' in os.environ:
+            return
+
         target_dir = os.path.dirname(self._dest_path)
         try:
             if not os.path.exists(target_dir):