Change in osmo-ci[master]: osmo-build-dep.sh: don't build osmo-gsm-manuals

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/22095 )

Change subject: osmo-build-dep.sh: don't build osmo-gsm-manuals
......................................................................

osmo-build-dep.sh: don't build osmo-gsm-manuals

Save time by only cloning the repository, and not running autoreconf
-fi, ./configure, make and make install. Especially the tests during
make took up significant time, that slowed every project depending on
osmo-gsm-manuals down while being built through master-builds or
gerrit-verifications jobs. Set OSMO_GSM_MANUALS_DIR to the clone
location.

This is an interim measure, I'll submit more patches soon that remove
the 'osmo-build-dep.sh osmo-gsm-manuals' calls from all projects.

Change-Id: I5238cf3f93ded97ed2b44d27868123a646e122dc
Related: OS#4912
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
M scripts/osmo-build-dep.sh
3 files changed, 10 insertions(+), 0 deletions(-)

Approvals:
  laforge: Looks good to me, approved; Verified



diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index a2f75ce..32a81f3 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -34,6 +34,7 @@
               -e JOB_NAME="$JOB_NAME" \
               -e MAKE=make \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \
               -e PARALLEL_MAKE="$PARALLEL_MAKE" \
               -e PATH="$PATH:/build_bin" \
               -e WITH_MANUALS="1" \
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index cdd3773..93d2e75 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -33,6 +33,7 @@
               -e JOB_NAME="$JOB_NAME" \
               -e MAKE=make \
               -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+              -e OSMO_GSM_MANUALS_DIR="/build/deps/osmo-gsm-manuals" \
               -e PARALLEL_MAKE="$PARALLEL_MAKE" \
               -e PATH="$PATH:/build_bin" \
               -e PUBLISH="1" \
diff --git a/scripts/osmo-build-dep.sh b/scripts/osmo-build-dep.sh
index 7013414..45916f6 100755
--- a/scripts/osmo-build-dep.sh
+++ b/scripts/osmo-build-dep.sh
@@ -54,6 +54,14 @@
 	cd "$subdir"
 fi
 
+# osmo-gsm-manuals: save time by only cloning the repository (OS#4912).
+# Projects depending on osmo-gsm-manuals can still build the manuals, because
+# we set OSMO_GSM_MANUALS_DIR to the clone destination.
+if [ "$project" = "osmo-gsm-manuals" ]; then
+	echo "WARNING: osmo-gsm-manuals cloned, but skipping build (OS#4912)"
+	exit 0
+fi
+
 autoreconf --install --force
 ./configure --prefix="$inst/stow/$project" --with-systemdsystemunitdir="$inst/stow/$project/lib/systemd/system" $cfg
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/22095
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I5238cf3f93ded97ed2b44d27868123a646e122dc
Gerrit-Change-Number: 22095
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210112/131cf153/attachment.htm>