osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ci/+/38270?usp=email )
Change subject: jobs/{master,gerrit}: pyosmocom: run pysim tests
......................................................................
jobs/{master,gerrit}: pyosmocom: run pysim tests
Related: OS#6572
Depends: pyosmocom I6bb7f137d3124e68574bc599969a8e7fd8b68904
Change-Id: I66a9f01382a788ae64adc60410ccbec9ec2dfc6b
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 40 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/70/38270/1
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 0e05918..956cea6 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -308,10 +308,27 @@
repos_url: '{gerrit_url}/python/{repos}'
gerrit_project: 'python/{repos}'
pipeline_binpkgs: "debian:12"
- a1_name: JOB_TYPE
- a1: !!python/tuple ["test", "pylint", "docs"]
+ concurrent: false
+ slave_axis: !!python/tuple [simtester,osmocom-gerrit]
+ a2_name: JOB_TYPE
+ a2: !!python/tuple ["test", "pylint", "docs", "pysim"]
+ combination_filter: >
+ (JOB_TYPE == "test" && label == "osmocom-gerrit") ||
+ (JOB_TYPE == "pylint" && label == "osmocom-gerrit") ||
+ (JOB_TYPE == "docs" && label == "osmocom-gerrit") ||
+ (JOB_TYPE == "pysim" && label == "simtester")
cmd: |
- {docker_run} -e JOB_TYPE="$JOB_TYPE" {docker_img} {timeout_cmd}
/build/contrib/jenkins.sh
+ case "$JOB_TYPE" in
+ "pysim")
+ {timeout_cmd} ./contrib/jenkins.sh
+ ;;
+ *)
+ {docker_run} \
+ -e JOB_TYPE="$JOB_TYPE" \
+ {docker_img} \
+ {timeout_cmd} /build/contrib/jenkins.sh
+ ;;
+ esac
- osmo-sgsn:
a1_name: IU
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 971b642..730c68c 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -421,10 +421,27 @@
- pyosmocom:
repos_url: '{gerrit_url}/python/{repos}'
- a1_name: JOB_TYPE
- a1: !!python/tuple ["test", "pylint", "docs"]
+ concurrent: false
+ slave_axis: !!python/tuple [simtester,osmocom-gerrit]
+ a2_name: JOB_TYPE
+ a2: !!python/tuple ["test", "pylint", "docs", "pysim"]
+ combination_filter: >
+ (JOB_TYPE == "test" && label == "osmocom-gerrit") ||
+ (JOB_TYPE == "pylint" && label == "osmocom-gerrit") ||
+ (JOB_TYPE == "docs" && label == "osmocom-gerrit") ||
+ (JOB_TYPE == "pysim" && label == "simtester")
cmd: |
- {docker_run} -e JOB_TYPE="$JOB_TYPE" {docker_img} {timeout_cmd}
/build/contrib/jenkins.sh
+ case "$JOB_TYPE" in
+ "pysim")
+ {timeout_cmd} ./contrib/jenkins.sh
+ ;;
+ *)
+ {docker_run} \
+ -e JOB_TYPE="$JOB_TYPE" \
+ {docker_img} \
+ {timeout_cmd} /build/contrib/jenkins.sh
+ ;;
+ esac
- osmo-sgsn:
a1_name: IU
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38270?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I66a9f01382a788ae64adc60410ccbec9ec2dfc6b
Gerrit-Change-Number: 38270
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
