laforge submitted this change.

View Change

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(-)

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 change 36528. To unsubscribe, or for help writing mail filters, visit settings.