canonical-hw-cert team mailing list archive

["LIAO, YU-SIANG" <mp+438276@xxxxxxxxxxxxxxxxxx>]

LIAO, YU-SIANG has proposed merging ~flyjerry0415/hwcert-jenkins-jobs:add-jammy-oem-29610-29611-29612-29621-29622-29751-29826-30711-30786 into hwcert-jenkins-jobs:master.

Commit message:
add jammy oem::29610,29611,29612,29621,29622,29751,29826,30711,30786 and delete focal-oem job that have same CID.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~flyjerry0415/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/438276
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~flyjerry0415/hwcert-jenkins-jobs:add-jammy-oem-29610-29611-29612-29621-29622-29751-29826-30711-30786 into hwcert-jenkins-jobs:master.

diff --git a/jobs/sru/projects/focal-oem.yaml b/jobs/sru/projects/focal-oem.yaml
index 0fcb769..c7368c8 100644
--- a/jobs/sru/projects/focal-oem.yaml
+++ b/jobs/sru/projects/focal-oem.yaml
@@ -344,11 +344,6 @@
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
         kernel-to-check: linux-oem-20_04
     - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
-        queue: 202111-29621
-        system-id: hp-pro-tower-400-g9-desktop-pc-c29621
-        image: 'stella-cmit-focal-amd64-X00-20220621-7'
-        kernel-to-check: linux-oem-20_04
-    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
         queue: 202008-28172
         system-id: hp-z2-tower-g5-workstation-c28172
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
@@ -364,11 +359,6 @@
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
         kernel-to-check: linux-oem-20_04
     - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
-        queue: 202111-29622
-        system-id: hp-pro-tower-400-g9-desktop-pc-c29622
-        image: 'stella-cmit-focal-amd64-X00-20220621-7'
-        kernel-to-check: linux-oem-20_04
-    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
         queue: 202008-28174
         system-id: hp-z2-sff-g5-workstation-c28174
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
@@ -444,16 +434,6 @@
         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}':
-        queue: 202112-29826
-        system-id: hp-proone-440-g9-all-in-one-desktop-pc-c29826
-        image: 'stella-cmit-focal-amd64-X00-20220621-7'
-        kernel-to-check: linux-oem-20_04
-    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
-        queue: 202112-29751
-        system-id: hp-proone-440-g9-all-in-one-desktop-pc-c29751
-        image: 'stella-cmit-focal-amd64-X00-20220621-7'
-        kernel-to-check: linux-oem-20_04
-    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
         queue: 202106-29179
         system-id: hp-prodesk-405-g6-small-form-factor-pc-c29179
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
@@ -489,16 +469,6 @@
         image: 'stella-cmit-focal-amd64-X00-20210420-1488'
         kernel-to-check: linux-oem-20_04
     - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
-        queue: 202111-29612
-        system-id: hp-pro-small-form-factor-400-g9-desktop-pc-c29612
-        image: 'stella-cmit-focal-amd64-X00-20220621-7'
-        kernel-to-check: linux-oem-20_04
-    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
-        queue: 202111-29610
-        system-id: hp-pro-small-form-factor-400-g9-desktop-pc-c29610 
-        image: 'stella-cmit-focal-amd64-X00-20220621-7'
-        kernel-to-check: linux-oem-20_04
-    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
         queue: 202201-29923
         system-id: hp-probook-440-14-inch-g9-c29923
         image: 'stella-cmit-focal-amd64-X00-20220621-7'
@@ -519,11 +489,6 @@
         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'
diff --git a/jobs/sru/projects/jammy-oem.yaml b/jobs/sru/projects/jammy-oem.yaml
index 2e322f1..0727792 100644
--- a/jobs/sru/projects/jammy-oem.yaml
+++ b/jobs/sru/projects/jammy-oem.yaml
@@ -18,3 +18,48 @@
         system-id: dell-xps-13-plus-c29762
         image: ''
         kernel-to-check: linux-oem-22_04a
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29610
+        system-id: hp-pro-small-form-factor-400-g9-desktop-pc-c29610
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29611
+        system-id: hp-pro-small-form-factor-400-g9-desktop-pc-c29611
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29612
+        system-id: hp-pro-small-form-factor-400-g9-desktop-pc-c29612
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29621
+        system-id: hp-pro-tower-400-g9-desktop-pc-c29621
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202111-29622
+        system-id: hp-pro-tower-400-g9-desktop-pc-c29622
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202112-29751
+        system-id: hp-proone-440-g9-all-in-one-desktop-pc-c29751
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202112-29826
+        system-id: hp-proone-440-g9-all-in-one-desktop-pc-c29826
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202210-30711
+        system-id: dell-inspiron-14-5430-c30711
+        image: ''
+        kernel-to-check: linux-oem-22_04b
+    - '{prefix}-{srutype}-sru-{series}-{flavor}-{system-id}':
+        queue: 202211-30786
+        system-id: dell-inspiron-16-5630-c30786
+        image: ''
+        kernel-to-check: linux-oem-22_04b