Convert all am-config files to the new syntax

Change-Id: Iff84bc901764d4ffe73f0cd6fa6c91d59a12b7b2
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

18 files changed, 6 insertions, 120 deletions

diff --git a/benchmarks/appman-bench/am-config.yaml b/benchmarks/appman-bench/am-config.yaml
index 3dd88817..21d47daf 100644
--- a/benchmarks/appman-bench/am-config.yaml
+++ b/benchmarks/appman-bench/am-config.yaml
@@ -3,9 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "${CONFIG_PWD}/manifests"
-  appImageMountDir: "${CONFIG_PWD}/image-mounts"
-  database: "${CONFIG_PWD}/apps.db"
 
 runtimes:
   qml:
diff --git a/examples/applicationmanager/application-features/am-config.yaml b/examples/applicationmanager/application-features/am-config.yaml
index effb5bfc..76dc4e7d 100644
--- a/examples/applicationmanager/application-features/am-config.yaml
+++ b/examples/applicationmanager/application-features/am-config.yaml
@@ -4,7 +4,6 @@ formatType: am-configuration
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
   installationDir: "/tmp/application-features/apps"
-  installedAppsManifestDir: "/tmp/application-features/manifests"
 
 logging:
   rules:
diff --git a/examples/applicationmanager/minidesk/am-config.yaml b/examples/applicationmanager/minidesk/am-config.yaml
index 376a2265..a557944d 100644
--- a/examples/applicationmanager/minidesk/am-config.yaml
+++ b/examples/applicationmanager/minidesk/am-config.yaml
@@ -1,16 +1,10 @@
 formatVersion: 1
 formatType: am-configuration
 ---
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/minidesk/apps"
-  documentPath: "/tmp/minidesk/docs"
-  mountPoint: "/tmp"
-  isDefault: true
-
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/minidesk/manifests"
+  installationDir: "/tmp/minidesk/apps"
+  documentDir: "/tmp/minidesk/docs"
 
 logging:
   rules:
diff --git a/template-opt/am/config-windows.yaml b/template-opt/am/config-windows.yaml
index 6c160fca..6af28123 100644
--- a/template-opt/am/config-windows.yaml
+++ b/template-opt/am/config-windows.yaml
@@ -6,4 +6,3 @@ formatType: am-configuration
 applications:
   installationDir: "c:/cygwin/opt/am/apps"
   documentDir: "c:/cygwin/opt/am/docs"
-  database: "c:/cygwin/opt/am/apps.db"
diff --git a/template-opt/am/config.yaml b/template-opt/am/config.yaml
index 38ce6195..b6ed82c4 100644
--- a/template-opt/am/config.yaml
+++ b/template-opt/am/config.yaml
@@ -6,4 +6,3 @@ formatType: am-configuration
 applications:
   installationDir: "/opt/am/apps"
   documentDir: "/opt/am/docs"
-  database: "/opt/am/apps.db"
diff --git a/tests/main/am-config.yaml b/tests/main/am-config.yaml
index 73e8bb2c..ff538f1b 100644
--- a/tests/main/am-config.yaml
+++ b/tests/main/am-config.yaml
@@ -5,7 +5,6 @@ applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/builtin-apps"
   installationDir: "/tmp/am-test-main/apps"
   documentDir: "/tmp/am-test-main/docs"
-  database: "/tmp/am-test-main/apps.db"
 
 ui:
   mainQml: "${CONFIG_PWD}/dummy.qml"
diff --git a/tests/qml/configs/am-config.yaml b/tests/qml/configs/am-config.yaml
index 34a4c56a..5333dae3 100644
--- a/tests/qml/configs/am-config.yaml
+++ b/tests/qml/configs/am-config.yaml
@@ -3,16 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am/manifests"
-  appImageMountDir: "/tmp/am/image-mounts"
-  database: "/tmp/am/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
-  isDefault: true
 
 # Workaround for a crash in the mesa software renderer (llvmpipe)
 runtimes:
diff --git a/tests/qml/crash/am-config.yaml b/tests/qml/crash/am-config.yaml
index b9c17b5e..61b2bfb2 100644
--- a/tests/qml/crash/am-config.yaml
+++ b/tests/qml/crash/am-config.yaml
@@ -3,15 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am-crash-test/manifests"
-  appImageMountDir: "/tmp/am-crash-test/image-mounts"
-  database: "/tmp/am-crash-test/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
 
 flags:
   noUiWatchdog: yes
diff --git a/tests/qml/installer/am-config.yaml b/tests/qml/installer/am-config.yaml
index 03a59daa..d0e12789 100644
--- a/tests/qml/installer/am-config.yaml
+++ b/tests/qml/installer/am-config.yaml
@@ -3,16 +3,8 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am-installer-test/manifests"
-  appImageMountDir: "/tmp/am-installer-test/image-mounts"
-  database: "/tmp/am-installer-test/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am-installer-test/apps"
-  documentPath: "/tmp/am-installer-test/docs"
-  mountPoint: "/tmp"
-  isDefault: true
+  installationDir: "/tmp/am-installer-test/apps"
+  documentDir: "/tmp/am-installer-test/docs"
 
 flags:
   noSecurity: yes
diff --git a/tests/qml/lifecycle/am-config.yaml b/tests/qml/lifecycle/am-config.yaml
index b9c17b5e..61b2bfb2 100644
--- a/tests/qml/lifecycle/am-config.yaml
+++ b/tests/qml/lifecycle/am-config.yaml
@@ -3,15 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am-crash-test/manifests"
-  appImageMountDir: "/tmp/am-crash-test/image-mounts"
-  database: "/tmp/am-crash-test/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
 
 flags:
   noUiWatchdog: yes
diff --git a/tests/qml/quicklaunch/am-config.yaml b/tests/qml/quicklaunch/am-config.yaml
index cb9e528a..e8de3d00 100644
--- a/tests/qml/quicklaunch/am-config.yaml
+++ b/tests/qml/quicklaunch/am-config.yaml
@@ -3,16 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am-quicklaunch-test/manifests"
-  appImageMountDir: "/tmp/am-quicklaunch-test/image-mounts"
-  database: "/tmp/am-quicklaunch-test/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
-  isDefault: true
 
 quicklaunch:
   runtimesPerContainer: 2
diff --git a/tests/qml/resources/am-config.yaml b/tests/qml/resources/am-config.yaml
index 8e3f8ee6..e204c0f2 100644
--- a/tests/qml/resources/am-config.yaml
+++ b/tests/qml/resources/am-config.yaml
@@ -3,9 +3,7 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am-resource-test/manifests"
   installationDir: "/tmp/am-resource-test/apps"
-  appImageMountDir: "/tmp/am-resource-test/image-mounts"
 
 ui:
   importPaths: "qrc:///qml"
diff --git a/tests/qml/simple/am-config.yaml b/tests/qml/simple/am-config.yaml
index 46309470..2a515905 100644
--- a/tests/qml/simple/am-config.yaml
+++ b/tests/qml/simple/am-config.yaml
@@ -3,16 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am-simple-test/manifests"
-  appImageMountDir: "/tmp/am-simple-test/image-mounts"
-  database: "/tmp/am-simple-test/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
-  isDefault: true
 
 ui:
   fullscreen: no
diff --git a/tests/qml/windowitem/am-config.yaml b/tests/qml/windowitem/am-config.yaml
index 34a4c56a..aa82540b 100644
--- a/tests/qml/windowitem/am-config.yaml
+++ b/tests/qml/windowitem/am-config.yaml
@@ -3,16 +3,8 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am/manifests"
-  appImageMountDir: "/tmp/am/image-mounts"
-  database: "/tmp/am/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
-  isDefault: true
+  installationDir: "/tmp/am/apps"
+  documentDir: "/tmp/am/docs"
 
 # Workaround for a crash in the mesa software renderer (llvmpipe)
 runtimes:
diff --git a/tests/qml/windowitem2/am-config.yaml b/tests/qml/windowitem2/am-config.yaml
index ee4edd72..5333dae3 100644
--- a/tests/qml/windowitem2/am-config.yaml
+++ b/tests/qml/windowitem2/am-config.yaml
@@ -3,16 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am-windowitem2/manifests"
-  appImageMountDir: "/tmp/am-windowitem2/image-mounts"
-  database: "/tmp/am-windowitem2/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am-windowitem2/apps"
-  documentPath: "/tmp/am-windowitem2/docs"
-  mountPoint: "/tmp"
-  isDefault: true
 
 # Workaround for a crash in the mesa software renderer (llvmpipe)
 runtimes:
diff --git a/tests/qml/windowmanager/am-config.yaml b/tests/qml/windowmanager/am-config.yaml
deleted file mode 100644
index d5d4813b..00000000
--- a/tests/qml/windowmanager/am-config.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-formatVersion: 1
-formatType: am-configuration
----
-applications:
-  installedAppsManifestDir: "/tmp/am/manifests"
-  appImageMountDir: "/tmp/am/image-mounts"
-  database: "/tmp/am/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
-  isDefault: true
diff --git a/tests/qml/windowmanager/windowmanager.pro b/tests/qml/windowmanager/windowmanager.pro
index 1e291c00..21cd8a91 100644
--- a/tests/qml/windowmanager/windowmanager.pro
+++ b/tests/qml/windowmanager/windowmanager.pro
@@ -1,4 +1,3 @@
-AM_CONFIG = am-config.yaml
 TEST_FILES = tst_windowmanager.qml
 
 OTHER_FILES += IviApplicationExtension.qml
diff --git a/tests/qml/windowmapping/am-config.yaml b/tests/qml/windowmapping/am-config.yaml
index 34a4c56a..5333dae3 100644
--- a/tests/qml/windowmapping/am-config.yaml
+++ b/tests/qml/windowmapping/am-config.yaml
@@ -3,16 +3,6 @@ formatType: am-configuration
 ---
 applications:
   builtinAppsManifestDir: "${CONFIG_PWD}/apps"
-  installedAppsManifestDir: "/tmp/am/manifests"
-  appImageMountDir: "/tmp/am/image-mounts"
-  database: "/tmp/am/apps.db"
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/tmp/am/apps"
-  documentPath: "/tmp/am/docs"
-  mountPoint: "/tmp"
-  isDefault: true
 
 # Workaround for a crash in the mesa software renderer (llvmpipe)
 runtimes: