pespin submitted this change.

View Change

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

libosmo-abis now depends on libosmo-netif

 Depends: libosmo-abis.git Change-Id I079dc3999de508301dd37ed03e399356a58d3cab
 Depends: libosmo-netif.git Change-Id I13d6e88158f6d9ce017986283183ee9c2cc68c
Change-Id: I27b3a2d4fa8d72924967ea7bf893322b9bfc16f9
---
M coverity/build_Osmocom.sh
M jobs/master-builds.yml
2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/coverity/build_Osmocom.sh b/coverity/build_Osmocom.sh
index 22ca629..4e2b8db 100755
--- a/coverity/build_Osmocom.sh
+++ b/coverity/build_Osmocom.sh
@@ -73,9 +73,9 @@
 build_default libosmocore
 build_libasn1c
 build_libusrp
+build_default libosmo-netif
 build_default libosmo-abis
 build_default libosmo-gprs
-build_default libosmo-netif
 build_default libosmo-pfcp
 build_default libosmo-sigtran
 build_default libsmpp34
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index f15386b..6f255fd 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -111,12 +111,15 @@
       - libosmo-abis:
           # Full triggers would be:
           # trigger: >
-          #   master-libosmo-netif, master-osmo-bsc, master-osmo-bts, master-osmo-hlr,
-          #   master-osmo-msc, master-osmo-sgsn
+          #   master-osmo-bsc, master-osmo-bts, master-osmo-hlr,
+          #   master-osmo-mgw, master-osmo-sgsn
           # Optimized:
           # (see comment at libosmocore)
           trigger: >
-            master-libosmo-netif, master-osmo-bts
+            master-osmo-bts,
+            master-osmo-hlr,
+            master-osmo-mgw,
+            master-osmo-sgsn
 
       - libosmo-dsp:
           repos_url: '{gitea_url}/sdr/{repos}'
@@ -142,16 +145,14 @@
       - libosmo-netif:
           # Full triggers would be:
           # trigger: >
-          #   master-libosmo-sigtran, mastere-osmo-hlr, master-osmo-iuh,
-          #   master-osmo-mgw, master-osmo-msc, master-osmo-sgsn, master-osmo-hnodeb,
-          #   master-osmo-hnbgw
+          # master-libosmo-abis, master-libosmo-sigtran, mastere-osmo-hlr,
+          # master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-sgsn,
+          # master-osmo-hnodeb, master-osmo-hnbgw
           # Optimized:
           # (see comment at libosmocore)
           trigger: >
-            master-libosmo-sigtran,
-            master-osmo-hlr,
-            master-osmo-mgw,
-            master-osmo-sgsn
+            master-libosmo-abis
+            master-libosmo-sigtran
 
       - libosmo-pfcp:
           # Full triggers would be:
@@ -185,27 +186,27 @@
           cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins_arch.sh "$arch"'
           # Full triggers would be:
           # trigger: >
-          #   master-libosmo-abis, master-libosmo-netif, master-libosmo-sigtran,
+          #   master-libosmo-netif, master-libosmo-abis, master-libosmo-sigtran,
           #   master-osmo-bsc, master-osmo-bts, master-osmo-ggsn, master-osmo-gmr, master-osmo-hlr,
           #   master-osmo-iuh, master-osmo-mgw, master-osmo-msc, master-osmo-pcap, master-osmo-pcu,
           #   master-osmo-sgsn, master-osmo-sip-connector, master-osmo-tetra, master-osmo-hnodeb
           #   master-osmocom-bb, master-simtrace, master-xgoldmon
           # Optimized:
           # libosmocore
-          # -> master-libosmo-abis
-          #    -> master-libosmo-netif
-          #       -> master-libosmo-sigtran
-          #          -> master-osmo-bsc
-          #          -> master-osmo-bsc-nat
-          #          -> master-osmo-iuh
-          #             -> master-osmo-msc
-          #             -> master-osmo-sgsn
-          #             -> master-osmo-hnodeb
+          # -> master-libosmo-netif
+          #    -> master-libosmo-abis
+          #    -> master-libosmo-sigtran
+          #       -> master-osmo-bsc
+          #       -> master-osmo-bsc-nat
+          #       -> master-osmo-iuh
           #          -> master-osmo-msc
           #          -> master-osmo-sgsn
-          #       -> master-osmo-hlr
-          #       -> master-osmo-mgw
+          #          -> master-osmo-hnodeb
+          #       -> master-osmo-msc
           #       -> master-osmo-sgsn
+          #    -> master-osmo-hlr
+          #    -> master-osmo-mgw
+          #    -> master-osmo-sgsn
           #    -> master-osmo-bts
           # -> master-libosmo-gprs
           #    -> master-osmo-pcu
@@ -216,7 +217,7 @@
           #    -> master-osmo-sgsn
           # [...]
           trigger: >
-            master-libosmo-abis,
+            master-libosmo-netif,
             master-libosmo-pfcp,
             master-osmo-gbproxy,
             master-osmo-ggsn,

To view, visit change 38845. To unsubscribe, or for help writing mail filters, visit settings.