osmith has uploaded this change for review.

View Change

jobs/gerrit: run osmo-ccid-firmware-hwtest

Related: SYS#7963
Change-Id: I438239f65f4b52fb5c77654b366b3c3254fcb44f
---
M jobs/gerrit-verifications.yml
M scripts/jenkins-gerrit/comment_generate.py
2 files changed, 26 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/37/42637/1

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 8405499..09c465b 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -108,6 +108,7 @@
     gerrit_project: '{repos}'
     # Which jobs to run in the pipeline
     pipeline_build: true
+    pipeline_hwtest: false
     pipeline_lint: true
     # Range from oldest supported Debian version to newest, see:
     # https://gerrit.osmocom.org/c/osmo-ci/+/40861/comment/d35a8783_2a3833a4/
@@ -480,6 +481,7 @@
 
       - osmo-ccid-firmware:
           pipeline_binpkgs: ""
+          pipeline_hwtest: true
           artifacts: "**/sysmoOCTSIM-*.bin"
           cmd: |
             {docker_run_ccache} \
@@ -589,6 +591,11 @@
           name: PIPELINE_BUILD
           description: Enable the build job (runs contrib/jenkins.sh)
           default: '{obj:pipeline_build}'
+      - string:
+          name: PIPELINE_HWTEST
+          description: |
+            Enable a hardware test job that uses artifacts from the build job.
+          default: '{obj:pipeline_hwtest}'
       - bool:
           name: PIPELINE_LINT
           description: Enable the lint job
@@ -654,9 +661,23 @@
                 when {{
                   expression {{ params.PIPELINE_BUILD }}
                 }}
-                steps {{
-                  script {{
-                    run_job("build", "gerrit-{repos}-build")
+                stages {{
+                  stage("Build (inner)") {{
+                    steps {{
+                      script {{
+                        run_job("build", "gerrit-{repos}-build")
+                      }}
+                    }}
+                  }}
+                  stage("HWTest") {{
+                    when {{
+                      expression {{ params.PIPELINE_HWTEST }}
+                    }}
+                    steps {{
+                      script {{
+                        run_job("hwtest", "gerrit-{repos}-hwtest")
+                      }}
+                    }}
                   }}
                 }}
               }}
diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py
index ff5a92a..fc8a8b1 100755
--- a/scripts/jenkins-gerrit/comment_generate.py
+++ b/scripts/jenkins-gerrit/comment_generate.py
@@ -61,6 +61,8 @@
         return "endianness"
     if job_name.endswith("-build"):
         return "build"
+    if job_name.endswith("-hwtest"):
+        return "hwtest"
     assert False, f"couldn't figure out stage from job_name: {job_name}"
 
 

To view, visit change 42637. To unsubscribe, or for help writing mail filters, visit settings.