diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2024-04-04 11:05:38 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2024-04-04 11:59:04 +0200 |
| commit | a307c7df718af05d978a65cd96a51138fb1b4d31 (patch) | |
| tree | 5c86e6b855f3e63d990b80ffa35f3a55d6b4ba77 | |
| parent | afd9d56e0568a61d0b2de010f710baffb71bff25 (diff) | |
jobs/gerrit,master: osmo-hnbgw: add nftables var
Build with and without nftables.
Related: OS#6425
Change-Id: I9828b70708dbe466c37df6ffb87b04362f14c71c
| -rw-r--r-- | jobs/gerrit-verifications.yml | 7 | ||||
| -rw-r--r-- | jobs/master-builds.yml | 7 |
2 files changed, 10 insertions, 4 deletions
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: |