diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2023-04-25 11:34:47 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2023-04-26 10:13:07 +0200 |
| commit | ddb8f3b05d3d724529ac89b5e08134be6f65fda0 (patch) | |
| tree | 12f1284f525c4e6ac54202bc57d1ce1d204170b4 | |
| parent | acf8c3cab58198bc57952469637f8d3be5e0dc71 (diff) | |
jobs/master,gerrit: use PFCP var for osmo-hnbgw
Build osmo-hnbgw with and without PFCP. Build the manuals with PFCP, so
it includes the additional VTY commands.
Related: OS#6013
Change-Id: I4a4e25e0c179c0d408c3728a28eb75bbfa086f48
| -rw-r--r-- | jobs/gerrit-verifications.yml | 16 | ||||
| -rw-r--r-- | jobs/master-builds.yml | 15 |
2 files changed, 29 insertions, 2 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index f32a07c..03d03b8 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -369,7 +369,21 @@ - osmo-smlc - osmo-gbproxy - osmo-hnodeb - - osmo-hnbgw + + - osmo-hnbgw: + a1_name: PFCP + a1: !!python/tuple ["1", "0"] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (PFCP == "1" && WITH_MANUALS == "1") || + (PFCP == "0" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e PFCP="$PFCP" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh + - osmo-upf - pysim: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 828bf52..17172ae 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -469,7 +469,20 @@ - osmo-smlc - osmo-gbproxy - osmo-hnodeb - - osmo-hnbgw + + - osmo-hnbgw: + a1_name: PFCP + a1: !!python/tuple ["1", "0"] + a2_name: WITH_MANUALS + a2: !!python/tuple ["1", "0"] + combination_filter: > + (PFCP == "1" && WITH_MANUALS == "1") || + (PFCP == "0" && WITH_MANUALS == "0") + cmd: | + {docker_run_ccache} \ + -e PFCP="$PFCP" \ + -e WITH_MANUALS="$WITH_MANUALS" \ + {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - rtl-sdr: git_base_url: https://gitea.osmocom.org/sdr |