laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/36528?usp=email ) Change subject: jobs/gerrit,master: osmo-hnbgw: add nftables var ...................................................................... jobs/gerrit,master: osmo-hnbgw: add nftables var Build with and without nftables. Related: OS#6425 Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 22 insertions(+), 4 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 3be106d..607e909 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -383,13 +383,16 @@ a1: !!python/tuple ["1", "0"] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] + a3_name: NFTABLES + a3: !!python/tuple ["1", "0"] combination_filter: > - (PFCP == "1" && WITH_MANUALS == "1") || - (PFCP == "0" && WITH_MANUALS == "0") + (PFCP == "1" && WITH_MANUALS == "1" && NFTABLES == "1") || + (PFCP == "0" && WITH_MANUALS == "0" && NFTABLES == "0") cmd: | {docker_run_ccache} \ -e PFCP="$PFCP" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e NFTABLES="$NFTABLES" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - osmo-upf: diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 66043e5..a902be8 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -503,13 +503,16 @@ a1: !!python/tuple ["1", "0"] a2_name: WITH_MANUALS a2: !!python/tuple ["1", "0"] + a3_name: NFTABLES + a3: !!python/tuple ["1", "0"] combination_filter: > - (PFCP == "1" && WITH_MANUALS == "1") || - (PFCP == "0" && WITH_MANUALS == "0") + (PFCP == "1" && WITH_MANUALS == "1" && NFTABLES == "1") || + (PFCP == "0" && WITH_MANUALS == "0" && NFTABLES == "0") cmd: | {docker_run_ccache} \ -e PFCP="$PFCP" \ -e WITH_MANUALS="$WITH_MANUALS" \ + -e NFTABLES="$NFTABLES" \ {docker_img} {timeout_cmd} /build/contrib/jenkins.sh - rtl-sdr: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/36528?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c Gerrit-Change-Number: 36528 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged