osmith has uploaded this change for review.

View Change

Stop building openbsc

With recent changes in libosmo-sccp, openbsc does not build anymore.
Harald suggested that we might want to stop building openbsc.git
altogether now.

Related: libosmo-sccp I299a32a2f8f61477cf49c8126567fef2092d5407
Change-Id: Ie58f54c3f2a224fb1e3a0c95bd3ed85e7859fdc9
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
M jobs/osmo-gsm-tester-builder.yml
M scripts/osmocom-build-old-tags-against-master.sh
4 files changed, 5 insertions(+), 39 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/58/38058/1

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index abeb383..f68102b 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -130,21 +130,6 @@
 
       - libusrp
 
-      - openbsc:
-          a1_name: SMPP
-          a1: !!python/tuple [--enable-smpp]
-          a2_name: MGCP
-          a2: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding]
-          a3_name: IU
-          a3: !!python/tuple [--disable-iu]
-          cmd: |
-            {docker_run_ccache} \
-              -e IU="$IU" \
-              -e SMPP="$SMPP" \
-              -e MGCP="$MGCP" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
-          pipeline_binpkgs: ""
-
       - openggsn:
           a1_name: GTP
           a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index a3711f0..3b5f254 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -99,7 +99,7 @@
           # Full triggers would be:
           # trigger: >
           #   master-libosmo-netif, master-osmo-bsc, master-osmo-bts, master-osmo-hlr,
-          #   master-osmo-msc, master-osmo-sgsn, master-openbsc
+          #   master-osmo-msc, master-osmo-sgsn
           # Optimized:
           # (see comment at libosmocore)
           trigger: >
@@ -129,7 +129,7 @@
       - libosmo-netif:
           # Full triggers would be:
           # trigger: >
-          #   master-libosmo-sccp, master-openbsc, mastere-osmo-hlr, master-osmo-iuh,
+          #   master-libosmo-sccp, mastere-osmo-hlr, master-osmo-iuh,
           #   master-osmo-mgw, master-osmo-msc, master-osmo-sgsn, master-osmo-hnodeb,
           #   master-osmo-hnbgw
           # Optimized:
@@ -153,12 +153,11 @@
       - libosmo-sccp:
           # Full triggers would be:
           # trigger: >
-          #   master-openbsc, master-osmo-bsc, master-osmo-iuh, master-osmo-msc,
+          #   master-osmo-bsc, master-osmo-iuh, master-osmo-msc,
           #   master-osmo-sgsn, master-osmo-hnodeb, master-osmo-hnbgw
           # Optimized:
           # (see comment at libosmocore)
           trigger: >
-            master-openbsc,
             master-osmo-bsc,
             master-osmo-bsc-nat,
             master-osmo-iuh,
@@ -173,7 +172,7 @@
           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-sccp, master-openbsc,
+          #   master-libosmo-abis, master-libosmo-netif, master-libosmo-sccp,
           #   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
@@ -183,7 +182,6 @@
           # -> master-libosmo-abis
           #    -> master-libosmo-netif
           #       -> master-libosmo-sccp
-          #          -> master-openbsc
           #          -> master-osmo-bsc
           #          -> master-osmo-bsc-nat
           #          -> master-osmo-iuh
@@ -219,26 +217,12 @@
             master-xgoldmon
 
       - libsmpp34:
-          trigger: master-osmo-msc, master-openbsc
+          trigger: master-osmo-msc
 
       - libtelnet
       - libusrp:
           trigger: master-osmo-trx
 
-      - openbsc:
-          a1_name: SMPP
-          a1: !!python/tuple [--enable-smpp]
-          a2_name: MGCP
-          a2: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding]
-          a3_name: IU
-          a3: !!python/tuple [--disable-iu]
-          cmd: |
-            {docker_run_ccache} \
-              -e IU="$IU" \
-              -e SMPP="$SMPP" \
-              -e MGCP="$MGCP" \
-              {docker_img} {timeout_cmd} /build/contrib/jenkins.sh
-
       - osmo-bsc
       - osmo-bsc-nat
 
diff --git a/jobs/osmo-gsm-tester-builder.yml b/jobs/osmo-gsm-tester-builder.yml
index cd50cb8..262663f 100644
--- a/jobs/osmo-gsm-tester-builder.yml
+++ b/jobs/osmo-gsm-tester-builder.yml
@@ -17,8 +17,6 @@
       - osmo-sgsn
       - osmo-trx
       - osmocom-bb
-      - osmo-nitb:
-          triggered-by: master-openbsc
       - osmo-stp:
           triggered-by: master-libosmo-sccp
       - osmo-bts-sysmo:
diff --git a/scripts/osmocom-build-old-tags-against-master.sh b/scripts/osmocom-build-old-tags-against-master.sh
index 5f0d04d..53d97a9 100755
--- a/scripts/osmocom-build-old-tags-against-master.sh
+++ b/scripts/osmocom-build-old-tags-against-master.sh
@@ -30,7 +30,6 @@
 	libosmocore
 	libosmo-netif
 	libosmo-sccp
-	openbsc
 	osmo-bsc
 	osmo-bts
 	osmo-ggsn

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