osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/32432 )

Change subject: jobs/master,gerrit: use PFCP var for osmo-hnbgw ......................................................................

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 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 42 insertions(+), 2 deletions(-)

Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved

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