October 2023 - gerrit-log - lists.osmocom.org

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk
by osmith 19 Oct '23

19 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email ) Change subject: scripts/tarballs: add gapk ...................................................................... scripts/tarballs: add gapk Closes: OS#6227 Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989 --- M scripts/common.sh A scripts/tarballs/prefer-configure.sh M scripts/tarballs/publish-tarballs-for-tags.sh 3 files changed, 48 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/scripts/common.sh b/scripts/common.sh index 8099499..194feff 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -77,11 +77,20 @@ local project="$1" local amount="$2" local default_str="$3" - local url ret + local url ret pattern + + case "$project" in + gapk) + pattern='refs/tags/v[0-9.]*$' + ;; + *) + pattern='refs/tags/[0-9.]*$' + ;; + esac url="$(osmo_git_clone_url "$project")" ret="$(git ls-remote --tags "$url")" - ret="$(echo "$ret" | grep 'refs/tags/[0-9.]*$' || true)" + ret="$(echo "$ret" | grep "$pattern" || true)" ret="$(echo "$ret" | sort -V -t/ -k3)" if [ "$amount" != "all" ]; then ret="$(echo "$ret" | tail -n "$amount")" diff --git a/scripts/tarballs/prefer-configure.sh b/scripts/tarballs/prefer-configure.sh new file mode 100755 index 0000000..f9f8613 --- /dev/null +++ b/scripts/tarballs/prefer-configure.sh @@ -0,0 +1,25 @@ +#!/bin/sh -ex +# Decide whether to build a tarball from autotools logic (exit 0) or by +# creating a simple git archive (exit 1) + +PROJECT="$1" +TAG="$2" + +if ! [ -e configure.ac ]; then + exit 1 +fi + +case "$PROJECT" in +gapk) + # Running gapk's configure involves running libgsmhr/fetch_sources.py, + # which according to git log doesn't really work unless using the + # version from master and it looks like we don't want to distribute + # these sources directly... or else we should just add them to the git + # repository and not rely on downloading a remote archive that may just + # change at any time. So create a simple git archive instead. + exit 1 + ;; +*) + exit 0 + ;; +esac diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 3cd8a15..26e949f 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -8,6 +8,7 @@ LOG_PREFIX="::" OSMO_RELEASE_REPOS=" + gapk libasn1c libgtpnl libosmo-abis @@ -237,7 +238,7 @@ cd /src/$project_path - if [ -e configure.ac ]; then + if /tarballs/prefer-configure.sh \"$repo\" \"$tag\"; then su build -c \"autoreconf -fi\" case \"$repo\" in osmo-trx) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989 Gerrit-Change-Number: 34817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-fl2k, rtl-sdr
by osmith 19 Oct '23

19 Oct '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email ) Change subject: scripts/tarballs: add osmo-fl2k, rtl-sdr ...................................................................... scripts/tarballs: add osmo-fl2k, rtl-sdr Closes: OS#6226, OS#6225 Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9 --- M scripts/common.sh M scripts/tarballs/publish-tarballs-for-tags.sh 2 files changed, 13 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/scripts/common.sh b/scripts/common.sh index 194feff..2bca384 100644 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -80,7 +80,7 @@ local url ret pattern case "$project" in - gapk) + gapk|osmo-fl2k) pattern='refs/tags/v[0-9.]*$' ;; *) diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh index 26e949f..e3dbf5b 100755 --- a/scripts/tarballs/publish-tarballs-for-tags.sh +++ b/scripts/tarballs/publish-tarballs-for-tags.sh @@ -23,6 +23,7 @@ osmo-cbc osmo-e1-recorder osmo-e1d + osmo-fl2k osmo-gbproxy osmo-ggsn osmo-gsm-manuals @@ -42,6 +43,7 @@ osmo-trx osmo-uecups osmocom-bb + rtl-sdr simtrace2 " -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9 Gerrit-Change-Number: 34818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk
by osmith 19 Oct '23

19 Oct '23

osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email ) Change subject: scripts/tarballs: add gapk ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989 Gerrit-Change-Number: 34817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:24:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder
by osmith 19 Oct '23

19 Oct '23

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email ) Change subject: scripts/tarballs: add osmo-e1-recorder ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6bd8387f99c258226125b33705645c43aadd875f Gerrit-Change-Number: 34815 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:24:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-fl2k, rtl-sdr
by pespin 19 Oct '23

19 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email ) Change subject: scripts/tarballs: add osmo-fl2k, rtl-sdr ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9 Gerrit-Change-Number: 34818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:23:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk
by pespin 19 Oct '23

19 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email ) Change subject: scripts/tarballs: add gapk ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989 Gerrit-Change-Number: 34817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:22:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-e1-recorder
by pespin 19 Oct '23

19 Oct '23

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email ) Change subject: scripts/tarballs: add osmo-e1-recorder ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34815?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6bd8387f99c258226125b33705645c43aadd875f Gerrit-Change-Number: 34815 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:21:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: scripts/common: osmo git last commit…: add vars
by pespin 19 Oct '23

19 Oct '23

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email ) Change subject: scripts/common: osmo_git_last_commit…: add vars ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34816?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7abbcefc8d5bd4c5b84c30a7e38ca3dcb855dd56 Gerrit-Change-Number: 34816 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:20:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: scripts/tarballs: add osmo-fl2k, rtl-sdr
by laforge 19 Oct '23

19 Oct '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email ) Change subject: scripts/tarballs: add osmo-fl2k, rtl-sdr ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34818?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idff299c65902b6818e409a409a3d303e8fccc4f9 Gerrit-Change-Number: 34818 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:17:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-ci[master]: scripts/tarballs: add gapk
by laforge 19 Oct '23

19 Oct '23

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email ) Change subject: scripts/tarballs: add gapk ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I6f26b6f5953701b383acb3b93058b66a286f7989 Gerrit-Change-Number: 34817 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 19 Oct 2023 09:17:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0