Attention is currently required from: pespin, daniel.

osmith has uploaded this change for review.

View Change

jobs: pysim: split into job types

Split the test, pylint and docs job types in the matrix to run them in
parallel.

Depends: pysim I5245c529db729e209d78a02ab9c917a90d0e0206
Related: OS#5497
Change-Id: Iea4f15fd9c9f8f36cb8d638c48da000eafe746a4
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 38 insertions(+), 4 deletions(-)

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

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index cc42a8e..8649635 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -338,9 +338,26 @@
       - osmo-upf
 
       - pysim:
-          slave_axis: !!python/tuple [simtester]
           concurrent: false
-          cmd: '{timeout_cmd} ./contrib/jenkins.sh'
+          slave_axis: !!python/tuple [simtester,osmocom-master]
+          a2_name: JOB_TYPE
+          a2: !!python/tuple ["test", "pylint", "docs"]
+          combination_filter: >
+            (JOB_TYPE == "test" && label == "simtester") ||
+            (JOB_TYPE == "pylint" && label == "osmocom-master") ||
+            (JOB_TYPE == "docs" && label == "osmocom-master")
+          cmd: |
+            case "$JOB_TYPE" in
+            "test")
+              {timeout_cmd} ./contrib/jenkins.sh
+              ;;
+            *)
+              {docker_run} \
+                -e JOB_TYPE="$JOB_TYPE" \
+                {docker_img} \
+                  {timeout_cmd} /build/contrib/jenkins.sh
+              ;;
+            esac
           pipeline_binpkgs: false
 
       - osmo-ttcn3-hacks:
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index eb186bf..adf5cea 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -418,8 +418,25 @@
 
       - pysim:
           concurrent: false
-          slave_axis: !!python/tuple [simtester]
-          cmd: 'PUBLISH=1 WITH_MANUALS=1 {timeout_cmd} ./contrib/jenkins.sh'
+          slave_axis: !!python/tuple [simtester,osmocom-master]
+          a2_name: JOB_TYPE
+          a2: !!python/tuple ["test", "pylint", "docs"]
+          combination_filter: >
+            (JOB_TYPE == "test" && label == "simtester") ||
+            (JOB_TYPE == "pylint" && label == "osmocom-master") ||
+            (JOB_TYPE == "docs" && label == "osmocom-master")
+          cmd: |
+            case "$JOB_TYPE" in
+            "test")
+              {timeout_cmd} ./contrib/jenkins.sh
+              ;;
+            *)
+              {docker_run} \
+                -e JOB_TYPE="$JOB_TYPE" \
+                {docker_img} \
+                  {timeout_cmd} /build/contrib/jenkins.sh
+              ;;
+            esac
 
       - sysmo-usim-tool:
           concurrent: false

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