← Back to team overview

canonical-hw-cert team mailing list archive

[Merge] ~flyjerry0415/hwcert-jenkins-jobs:add-hp-sixteen-devices into hwcert-jenkins-jobs:master

 

LIAO, YU-SIANG has proposed merging ~flyjerry0415/hwcert-jenkins-jobs:add-hp-sixteen-devices into hwcert-jenkins-jobs:master.

Commit message:
Add: add 16 device in focal-oem.yaml for hp::29923,28483,29664,29689,29611,28773,29922,28482,29921,28175,28774,28937,28938,28777,28961,28939

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~flyjerry0415/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/436883
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~flyjerry0415/hwcert-jenkins-jobs:add-hp-sixteen-devices into hwcert-jenkins-jobs:master.
diff --git a/jobs/sru/projects/focal-oem.yaml b/jobs/sru/projects/focal-oem.yaml
index 855b0c7..48a71de 100644
--- a/jobs/sru/projects/focal-oem.yaml
+++ b/jobs/sru/projects/focal-oem.yaml
@@ -459,6 +459,7 @@
         image: 'dell-bto-focal-fossa-tangela-jsl-X123-20210909-17_A00'
         kernel-to-check: linux-oem-20_04
     - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+<<<<<<< jobs/sru/projects/focal-oem.yaml
         queue: 202112-29826
         system-id: hp-proone-440-g9-all-in-one-desktop-pc-c29826
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
@@ -511,5 +512,84 @@
     - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
         queue: 202111-29610
         system-id: hp-pro-small-form-factor-400-g9-desktop-pc-c29610 
+=======
+        queue: 202201-29923
+        system-id: hp-probook-440-14-inch-g9-c29923
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202012-28483
+        system-id: hp-zbook-fury-17-g7-mobile-workstation-c28483
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29664
+        system-id: hp-elite-tower-880-g9-desktop-pc-c29664
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29689
+        system-id: hp-elite-sff-600-g9-desktop-pc-c29689
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29611
+        system-id: hp-pro-small-form-factor-400-g9-desktop-pc-c29611
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202103-28773
+        system-id: hp-probook-640-g8-notebook-pc-c28773
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202201-29922
+        system-id: hp-probook-440-14-inch-g9-c29922
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202012-28482
+        system-id: hp-zbook-fury-17-g7-mobile-workstation-c28482
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202201-29921
+        system-id: hp-probook-440-14-inch-g9-c29921
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202008-28175
+        system-id: hp-z2-sff-g5-workstation-c28175
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202103-28774
+        system-id: hp-probook-640-g8-notebook-pc-c28774
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202104-28937
+        system-id: hp-elitedesk-805-g8-small-form-factor-pc-c28937
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202104-28938
+        system-id: hp-elitedesk-805-g8-small-form-factor-pc-c28938
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202103-28777
+        system-id: hp-probook-650-g8-notebook-pc-c28777
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202104-28961
+        system-id: hp-elitebook-855-g8-notebook-pc-c28961
+        image: 'stella-cmit-focal-amd64-X00-20220621-7'
+        kernel-to-check: linux-oem-20_04
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202104-28939
+        system-id: hp-prodesk-405-g8-small-form-factor-pc-c28939
+>>>>>>> jobs/sru/projects/focal-oem.yaml
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
         kernel-to-check: linux-oem-20_04