Merge ~rodsmith/plainbox-provider-certification-server:fwupdate-test2 into plainbox-provider-certification-server:master

[Rod Smith]

This is a new submission of the old merge to add the fwupdate test to the .pxu files for server cert. (The old submission was marked as merged after I accidentally re-used the wrong git branch as a basis for another merge.) See https://code.launchpad.net/~rodsmith/plainbox-provider-checkbox/+git/plainbox-provider-checkbox/+merge/308857 for the actual new test.

[Jeff Lane  (bladernr)]

+1

review: Approve

[Jeff Lane  (bladernr)]

Now that I just pushed this, need to check one more thing (so I re-set it to needs review).

What about the fake package for fwupdate for 14.04 that Sylvain mentioned?

I saw email comments from him that aren't on this, I presume the were on the older version of this MR? Anyway, just need to make sure his comment is addressed so we don't break on 14.04... (not that I care about 14.04, but they do).

review: Needs Information

[Jeff Lane  (bladernr)]

weird...I moved it to needs info or whatever, and it still got merged. But dummy packages are done now anyway.

review: Approve

diff --git a/units/firmware-tests.pxu b/units/firmware-tests.pxu
index 2b0e098..ad6b286 100644
--- a/units/firmware-tests.pxu
+++ b/units/firmware-tests.pxu
@@ -40,6 +40,7 @@ mandatory_include:
 include:
     miscellanea/ipmi_test
     miscellanea/bmc_info
+    miscellanea/fwupdate                       certification-status=non-blocker
     miscellanea/fwts_test
     miscellanea/fwts_results.log
     memory/info
diff --git a/units/packaging.pxu b/units/packaging.pxu
index fe0e272..f309b10 100644
--- a/units/packaging.pxu
+++ b/units/packaging.pxu
@@ -7,3 +7,8 @@ Depends: iperf3
 unit: packaging meta-data
 os-id: debian
 Depends: genisoimage
+
+# The 'miscellanea/fwupdate' job requires the fwupdate package
+unit: packaging meta-data
+os-id: debian
+Depends: fwupdate
diff --git a/units/server-full-16.04.pxu b/units/server-full-16.04.pxu
index c871460..6171c77 100644
--- a/units/server-full-16.04.pxu
+++ b/units/server-full-16.04.pxu
@@ -43,6 +43,7 @@ include:
     info/hdparm_.*.txt                         certification-status=non-blocker
     miscellanea/ipmi_test                      certification-status=blocker
     miscellanea/bmc_info                       certification-status=non-blocker
+    miscellanea/fwupdate                       certification-status=non-blocker
     benchmarks/disk/hdparm-read_.*             certification-status=blocker
     benchmarks/disk/hdparm-cache-read_.*       certification-status=blocker
     cpu/clocktest                              certification-status=blocker
diff --git a/units/server-functional-16.04.pxu b/units/server-functional-16.04.pxu
index e64bbef..95fedcb 100644
--- a/units/server-functional-16.04.pxu
+++ b/units/server-functional-16.04.pxu
@@ -43,6 +43,7 @@ include:
     info/hdparm_.*.txt                         certification-status=non-blocker
     miscellanea/ipmi_test                      certification-status=blocker
     miscellanea/bmc_info                       certification-status=non-blocker
+    miscellanea/fwupdate                       certification-status=non-blocker
     benchmarks/disk/hdparm-read_.*             certification-status=blocker
     benchmarks/disk/hdparm-cache-read_.*       certification-status=blocker
     cpu/clocktest                              certification-status=blocker