canonical-hw-cert team mailing list archive

[Sylvain Pineau <mp+436602@xxxxxxxxxxxxxxxxxx>]

Sylvain Pineau has proposed merging ~sylvain-pineau/hwcert-jenkins-jobs:edgex_extra_snapd into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~sylvain-pineau/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/436602

UC16 edgeX tests are now using a base20 and cannot call the snap command w/o snapd installed.
This patch to jenkins jobs ensures the snapd snap is present before starting checkbox tests.
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~sylvain-pineau/hwcert-jenkins-jobs:edgex_extra_snapd into hwcert-jenkins-jobs:master.

diff --git a/jobs/snap-testing/projects/amd64.yaml b/jobs/snap-testing/projects/amd64.yaml
index 4ed521f..50d0f6e 100644
--- a/jobs/snap-testing/projects/amd64.yaml
+++ b/jobs/snap-testing/projects/amd64.yaml
@@ -111,6 +111,7 @@
           checkbox_track: uc18
       - '{prefix}-{name}-{snap}-{channel}':
           snap: edgexfoundry
+          extra_snaps: bluez docker snapd
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
           checkbox_snap: checkbox-edgexfoundry
@@ -119,6 +120,7 @@
           launcher: latest
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: bluez docker snapd
           track: '2.0'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
@@ -130,6 +132,7 @@
             !include-raw-escape: jobs/snap-testing/configs/checkbox.conf.edgexfoundry-2.0
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: bluez docker snapd
           track: '2.1'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
@@ -313,7 +316,7 @@
     provision_data: |
       provision_data:
             distro: ubuntu-core-16-amd64
-    extra_snaps: bluez
+    extra_snaps: bluez snapd
     checkbox_conf:
       !include-raw-escape: jobs/snap-testing/configs/checkbox.conf.edgexfoundry-stable
     manifest:
@@ -337,7 +340,7 @@
     jobs:
       - '{prefix}-{name}-{snap}-{channel}':
           snap: edgexfoundry
-          extra_snaps: bluez docker
+          extra_snaps: bluez docker snapd
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           has-serial-assertion: False
           snap_install: False
@@ -347,6 +350,7 @@
           launcher: latest
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: bluez docker snapd
           track: '2.0'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           has-serial-assertion: False
@@ -359,6 +363,7 @@
             !include-raw-escape: jobs/snap-testing/configs/checkbox.conf.edgexfoundry-2.0
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: bluez docker snapd
           track: '2.1'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           has-serial-assertion: False
diff --git a/jobs/snap-testing/projects/caracalla-media.yaml b/jobs/snap-testing/projects/caracalla-media.yaml
index af16c3c..2eaa69a 100644
--- a/jobs/snap-testing/projects/caracalla-media.yaml
+++ b/jobs/snap-testing/projects/caracalla-media.yaml
@@ -104,6 +104,7 @@
           launcher: caracalla-test-runner-automated-docker
       - '{prefix}-{name}-{snap}-{channel}':
           snap: edgexfoundry
+          extra_snaps: docker wifi-ap bluez snapd
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
           checkbox_snap: checkbox-edgexfoundry
@@ -112,6 +113,7 @@
           launcher: latest
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: docker wifi-ap bluez snapd
           track: '2.0'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
@@ -123,6 +125,7 @@
             !include-raw-escape: jobs/snap-testing/configs/checkbox.conf.edgexfoundry-2.0
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: docker wifi-ap bluez snapd
           track: '2.1'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
diff --git a/jobs/snap-testing/projects/stlouis.yaml b/jobs/snap-testing/projects/stlouis.yaml
index 76147f3..7b2c6e4 100644
--- a/jobs/snap-testing/projects/stlouis.yaml
+++ b/jobs/snap-testing/projects/stlouis.yaml
@@ -99,6 +99,7 @@
           launcher: st-louis-test-runner-automated-docker
       - '{prefix}-{name}-{snap}-{channel}':
           snap: edgexfoundry
+          extra_snaps: docker wifi-ap bluez snapd
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
           checkbox_snap: checkbox-edgexfoundry
@@ -107,6 +108,7 @@
           launcher: latest
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: docker wifi-ap bluez snapd
           track: '2.0'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False
@@ -118,6 +120,7 @@
             !include-raw-escape: jobs/snap-testing/configs/checkbox.conf.edgexfoundry-2.0
       - '{prefix}-{name}-{snap}-{track}-{channel}-group':
           snap: edgexfoundry
+          extra_snaps: docker wifi-ap bluez snapd
           track: '2.1'
           email: ce-certification-qa@xxxxxxxxxxxxxxxxxxx,espy@xxxxxxxxxxxxx,siggi.skulason@xxxxxxxxxxxxx,mengyi.wang@xxxxxxxxxxxxx,farshid.tavakolizadeh@xxxxxxxxxxxxx
           snap_install: False