Checkbox Provider - Base

Merge ~bladernr/plainbox-provider-checkbox:1853847-no-cpu-scaling-on-power into plainbox-provider-checkbox:master

  1. Git
  2. lp:~bladernr/plainbox-provider-checkbox
  3. 1853847-no-cpu-scaling-on-power
  4. Merge into master
Proposed by Jeff Lane 
Status: Merged
Approved by: Jeff Lane 
Approved revision: 0aa1c88d522dabe98627bc210e1d38bde33aa317
Merged at revision: ae6dc340a022b6ea1dd4774c52ea234297c4b37c
Proposed branch: ~bladernr/plainbox-provider-checkbox:1853847-no-cpu-scaling-on-power
Merge into: plainbox-provider-checkbox:master
Diff against target: 12 lines (+1/-0)
1 file modified
units/cpu/jobs.pxu (+1/-0)
Reviewer Review Type Date Requested Status
Jeff Lane  Approve
Devices Certification Bot Needs Fixing
Jonathan Cave (community) Approve
Review via email: mp+375954@code.launchpad.net

Commit message

update cpu/scaling to not run on s390x and ppc64el

Description of the change

update cpu/scaling to not run on s390x and ppc64el

To post a comment you must log in.
Revision history for this message
Jonathan Cave (jocave) wrote :

+1

review: Approve
Revision history for this message
Devices Certification Bot (ce-certification-qa) wrote :

I tried to merge it but there are some problems. Typically you want to merge or rebase and try again.

review: Needs Fixing
Revision history for this message
Devices Certification Bot (ce-certification-qa) wrote :

The merge was fine but running tests failed.

[bionic] [08:36:20] starting container
[xenial] [08:36:20] starting container
Device project added to bionic-testing
Device project added to xenial-testing
[xenial] [08:36:29] provisioning container
[bionic] [08:36:33] provisioning container
[bionic] [08:36:49] Starting tests...
[bionic] Found a test script: ./requirements/container-tests-provider-checkbox
[xenial] [08:36:49] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-checkbox
[xenial] [08:37:42] container-tests-provider-checkbox: FAIL
[bionic] [08:37:44] container-tests-provider-checkbox: FAIL
[xenial] output: https://paste.ubuntu.com/p/wMBGFRWfFY/
[xenial] [08:37:45] Fixing file permissions in source directory
[xenial] [08:37:45] Destroying container
[bionic] output: https://paste.ubuntu.com/p/b8Yth8sY8y/
[bionic] [08:37:47] Fixing file permissions in source directory
[bionic] [08:37:47] Destroying container

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

@Jeff, rebasing should remove the conflicts.

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

error: ???: Cannot load job definitions from '/root/project/units/cpu/jobs.pxu': Unexpected non-empty line: '<<<<<<< HEAD\n' (jobs.pxu, line 7)

Revision history for this message
Jeff Lane  (bladernr) wrote :

Rebased on current master, resolved merge conflicts. Self-approve

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 dccf2e4..33446a8 100644
3--- a/units/cpu/jobs.pxu
4+++ b/units/cpu/jobs.pxu
5@@ -5,6 +5,7 @@ estimated_duration: 150.0
6 requires:
7 executable.name == 'fwts'
8 'userspace' in cpuinfo.governors
9+ cpuinfo.platform not in ("ppc64el", "s390x")
10 user: root
11 environ: PLAINBOX_SESSION_SHARE LD_LIBRARY_PATH SNAP
12 command:

Subscribers

People subscribed via source and target branches