fixeria has uploaded this change for review.

View Change

jobs/gerrit-verifications.yml: pysim: allow skipping card tests

I've already implemented this logic in 6a3b8a0, however by mistake
I added it to master-builds.yml instead of gerrit-verifications.yml.
This is wrong because we specifically need this feature for Jenkins
verification, not for the master builds.

For daily master builds, on the other hand, we specifically want to
execute all existing job types, so revert my recent changes from
master-builds.yml, but keep the new job type.

Change-Id: I986d88545f64e13cd571ba9ff56bc924822e39a0
Fixes: 6a3b8a0 ("jobs/master-builds.yml: pysim: allow skipping card tests")
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 14 insertions(+), 10 deletions(-)

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

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 1177a51..0821617 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -103,6 +103,7 @@
     timeout_cmd: '/usr/bin/timeout 30m'
     wrapper_cmd: '{timeout_cmd} /osmo-ci/scripts/wrapper_core_bt_on_error.sh'
     cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh'
+    check_jenkins_mark: 'git show --summary --format=%B | grep "^Jenkins:" | grep -q'
     gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418'
     repos_url: '{gerrit_url}/{repos}'
     gerrit_project: '{repos}'
@@ -535,9 +536,10 @@
           concurrent: false
           slave_axis: !!python/tuple [simtester,osmocom-gerrit]
           a2_name: JOB_TYPE
-          a2: !!python/tuple ["test", "distcheck", "pylint", "docs"]
+          a2: !!python/tuple ["test", "card-test", "distcheck", "pylint", "docs"]
           combination_filter: >
             (JOB_TYPE == "test" && label == "simtester") ||
+            (JOB_TYPE == "card-test" && label == "simtester") ||
             (JOB_TYPE == "distcheck" && label == "osmocom-gerrit") ||
             (JOB_TYPE == "pylint" && label == "osmocom-gerrit") ||
             (JOB_TYPE == "docs" && label == "osmocom-gerrit")
@@ -546,6 +548,14 @@
             "test")
               {timeout_cmd} ./contrib/jenkins.sh
               ;;
+            "card-test")
+              if {check_jenkins_mark} "skip-card-test"; then
+                # skip tests requiring physical cards
+                echo "GERRIT_PIPELINE_JOB_SKIPPED"
+              else
+                {timeout_cmd} ./contrib/jenkins.sh
+              fi
+              ;;
             *)
               {docker_run} \
                 -e JOB_TYPE="$JOB_TYPE" \
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 4fcffdf..373c27d 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -86,7 +86,6 @@
     timeout_cmd: '/usr/bin/timeout 30m'
     wrapper_cmd: '{timeout_cmd} /osmo-ci/scripts/wrapper_core_bt_on_error.sh'
     cmd: '{docker_run_ccache} {docker_img} {wrapper_cmd} /build/contrib/jenkins.sh'
-    check_jenkins_mark: 'git show --summary --format=%B | grep "^Jenkins:" | grep -q'
     trigger:
     email: jenkins-notifications@lists.osmocom.org laforge@gnumonks.org
     gerrit_url: 'https://gerrit.osmocom.org'
@@ -642,20 +641,15 @@
           a2_name: JOB_TYPE
           a2: !!python/tuple ["test", "card-test", "distcheck", "pylint", "docs"]
           combination_filter: >
-            (JOB_TYPE == "test" && label == "osmocom-master") ||
+            (JOB_TYPE == "test" && label == "simtester") ||
             (JOB_TYPE == "card-test" && label == "simtester") ||
             (JOB_TYPE == "distcheck" && label == "osmocom-master") ||
             (JOB_TYPE == "pylint" && label == "osmocom-master") ||
             (JOB_TYPE == "docs" && label == "osmocom-master")
           cmd: |
             case "$JOB_TYPE" in
-            "card-test")
-              if {check_jenkins_mark} "skip-card-test"; then
-                # skip tests requiring physical cards
-                echo "GERRIT_PIPELINE_JOB_SKIPPED"
-              else
-                {timeout_cmd} ./contrib/jenkins.sh
-              fi
+            "test"|"card-test")
+              {timeout_cmd} ./contrib/jenkins.sh
               ;;
             *)
               {docker_run} \

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