summaryrefslogtreecommitdiff
diff options
authorPMR <pmr@pmr-lander>2020-02-25 09:21:00 +0000
committerPMR <pmr@pmr-lander>2020-02-25 09:21:00 +0000
commit3989c6369dc814eb16dfdbfe78c4ef080ce8d5e7 (patch)
tree80cfdef4879d700c695066d8c501f02814a35436
parentabf7b730db40fd3345536f1e93ace2622cd4fdec (diff)
parent2d9c2810849241d0e9224d05ea66c1bde6b8fa93 (diff)
Merge #379781 from ~narahuang/oem-qa-checkbox/+git/oem-plainbox:rename-noone-otaru
-rw-r--r--debian/control6
-rw-r--r--debian/plainbox-provider-oem-otaru.install (renamed from debian/plainbox-provider-oem-noone.install)4
-rw-r--r--etc/otaru/plainbox.conf (renamed from etc/noone/plainbox.conf)0
-rwxr-xr-xlauncher/otaru-cli (renamed from launcher/noone-cli)6
-rw-r--r--units/noone-full.pxu7
-rw-r--r--units/otaru-auto.pxu (renamed from units/noone-auto.pxu)6
-rw-r--r--units/otaru-full.pxu7
7 files changed, 18 insertions, 18 deletions
diff --git a/debian/control b/debian/control
index 6d80ba6..bdea531 100644
--- a/debian/control
+++ b/debian/control
@@ -52,9 +52,9 @@ Conflicts: plainbox-provider-oem-kittyhawk, plainbox-provider-oem-sutton, plainb
Description: plainbox oem provider for somerville
Plainbox OEM provider to run OEM-specific jobs and test plans (Somerville)
-Package: plainbox-provider-oem-noone
+Package: plainbox-provider-oem-otaru
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}, plainbox-provider-oem (= ${source:Version}), openssh-server
Conflicts: plainbox-provider-oem-kittyhawk, plainbox-provider-oem-sutton, plainbox-provider-oem-somerville, plainbox-provider-oem-stella
-Description: plainbox oem provider for no-one team
- Plainbox OEM provider to run OEM-specific jobs and test plans (No one)
+Description: plainbox oem provider for otaru
+ Plainbox OEM provider to run OEM-specific jobs and test plans (ce-iot-qa)
diff --git a/debian/plainbox-provider-oem-noone.install b/debian/plainbox-provider-oem-otaru.install
index 83d246c..3579089 100644
--- a/debian/plainbox-provider-oem-noone.install
+++ b/debian/plainbox-provider-oem-otaru.install
@@ -1,5 +1,5 @@
-etc/noone/plainbox.conf etc/xdg
-launcher/noone-cli usr/bin
+etc/otaru/plainbox.conf etc/xdg
+launcher/otaru-cli usr/bin
launcher/carson-cli usr/bin
launcher/stella-cli usr/bin
launcher/somerville-cli usr/bin
diff --git a/etc/noone/plainbox.conf b/etc/otaru/plainbox.conf
index 300d7cb..300d7cb 100644
--- a/etc/noone/plainbox.conf
+++ b/etc/otaru/plainbox.conf
diff --git a/launcher/noone-cli b/launcher/otaru-cli
index feeae9c..49e0172 100755
--- a/launcher/noone-cli
+++ b/launcher/otaru-cli
@@ -2,11 +2,11 @@
[launcher]
launcher_version = 1
-app_id = com.canonical.certification:noone-testing
+app_id = com.canonical.certification:otaru-testing
[test plan]
-filter = *noone*
-unit = com.canonical.ce::noone-full
+filter = *otaru*
+unit = com.canonical.ce::otaru-full
[config]
config_filename = plainbox.conf
diff --git a/units/noone-full.pxu b/units/noone-full.pxu
deleted file mode 100644
index 4f7cfa6..0000000
--- a/units/noone-full.pxu
+++ /dev/null
@@ -1,7 +0,0 @@
-id: noone-full
-_name: No One Full Test
-unit: test plan
-_description: No-one Full
-include:
-nested_part:
- oem-generic-full
diff --git a/units/noone-auto.pxu b/units/otaru-auto.pxu
index 326e62f..3d823f2 100644
--- a/units/noone-auto.pxu
+++ b/units/otaru-auto.pxu
@@ -1,7 +1,7 @@
-id: noone-auto
-_name: No one Auto Tests
+id: otaru-auto
+_name: Otaru Auto Tests
unit: test plan
-_description: No one Auto Tests
+_description: Otaru Auto Tests
include:
nested_part:
oem-generic-auto
diff --git a/units/otaru-full.pxu b/units/otaru-full.pxu
new file mode 100644
index 0000000..895c558
--- /dev/null
+++ b/units/otaru-full.pxu
@@ -0,0 +1,7 @@
+id: otaru-full
+_name: Otaru Full Test
+unit: test plan
+_description: Otaru Full
+include:
+nested_part:
+ oem-generic-full