Merge ~bladernr/plainbox-provider-checkbox:1800699-remove-purley-test-take-2 into plainbox-provider-checkbox:master

Proposed by Jeff Lane 
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 3d62988cad059e3751545ae0a66656333339da9b
Merged at revision: f63d35019d46756c2381e5b6f9030617f44c1e9f
Proposed branch: ~bladernr/plainbox-provider-checkbox:1800699-remove-purley-test-take-2
Merge into: plainbox-provider-checkbox:master
Diff against target: 17 lines (+0/-9)
1 file modified
units/cpu/jobs.pxu (+0/-9)
Reviewer Review Type Date Requested Status
Sylvain Pineau Approve
Review via email: mp+358320@code.launchpad.net

Description of the change

This is the output, clearly showing no extraneous code:
bladernr@bionic:~/development/git/plainbox-provider-checkbox$ git diff
diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
index bb75f6d..a027aa9 100644
--- a/units/cpu/jobs.pxu
+++ b/units/cpu/jobs.pxu
@@ -174,12 +174,3 @@ _siblings: [
       "command": "cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -",
       "depends": "com.canonical.certification::suspend/suspend_advanced_auto"}
  ]
-
-plugin: shell
-category_id: com.canonical.plainbox::cpu
-estimated_duration: 0.5
-id: cpu/purley_id
-command:
- egrep -q avx512 /proc/cpuinfo && echo "This is a Purley CPU" || echo "CPU is NOT Purley"
-_description: Identifies Purley Platform CPUs
-
bladernr@bionic:~/development/git/plainbox-provider-checkbox$ git commit -am "second try removing purley test, it should not be this difficult"
[1800699-remove-purley-test-take-2 3d62988] second try removing purley test, it should not be this difficult
 1 file changed, 9 deletions(-)
bladernr@bionic:~/development/git/plainbox-provider-checkbox$ git push bladernr
Counting objects: 124, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (67/67), done.
Writing objects: 100% (124/124), 16.38 KiB | 16.38 MiB/s, done.
Total 124 (delta 71), reused 107 (delta 57)
To git+ssh://git.launchpad.net/~bladernr/plainbox-provider-checkbox
 * [new branch] 1800699-remove-purley-test-take-2 -> 1800699-remove-purley-test-take-2

To post a comment you must log in.
Revision history for this message
Jeff Lane  (bladernr) wrote :

Looks like that cleaned it up. Finally. This was quite an inconvenient way to land a few lines of deletions.

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

\o/

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
2index bb75f6d..a027aa9 100644
3--- a/units/cpu/jobs.pxu
4+++ b/units/cpu/jobs.pxu
5@@ -174,12 +174,3 @@ _siblings: [
6 "command": "cpuinfo_resource | diff $PLAINBOX_SESSION_SHARE/cpuinfo_before_suspend -",
7 "depends": "com.canonical.certification::suspend/suspend_advanced_auto"}
8 ]
9-
10-plugin: shell
11-category_id: com.canonical.plainbox::cpu
12-estimated_duration: 0.5
13-id: cpu/purley_id
14-command:
15- egrep -q avx512 /proc/cpuinfo && echo "This is a Purley CPU" || echo "CPU is NOT Purley"
16-_description: Identifies Purley Platform CPUs
17-

Subscribers

People subscribed via source and target branches