laforge submitted this change.

View Change


Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified
publish-tarballs-for-tags.sh: publish osmo-epdg's versions

To have explicit different tags for strongswan and not to clash
against the upstream tag, use prefix osmo-epdg for tags.
0.1.0 -> osmo-epdg-0.1.0.

osmo-epdg tags will follow the common version pattern (0.1.0).

Change-Id: I3445e76f6fd6ebb49ada5dc4320c6b9fa717f00c
---
M scripts/common.sh
M scripts/tarballs/prefer-configure.sh
M scripts/tarballs/publish-tarballs-for-tags.sh
3 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index e1d8718..fd216ca 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -80,6 +80,9 @@
local url ret pattern

case "$project" in
+ strongswan-epdg)
+ pattern='refs/tags/osmo-epdg-[0-9.]*$'
+ ;;
gapk|osmo-fl2k|rtl-sdr)
pattern='refs/tags/v[0-9.]*$'
;;
@@ -139,6 +142,9 @@
osmo-isdntap)
echo "$OSMO_GIT_URL_GITEA"/retronetworking/"$1"
;;
+ strongswan-epdg)
+ echo "$OSMO_GIT_URL_GITEA"/ims-volte-vowifi/strongswan
+ ;;
osmo_dia2gsup|osmo-epdg)
echo "$OSMO_GIT_URL_GERRIT"/erlang/"$1"
;;
diff --git a/scripts/tarballs/prefer-configure.sh b/scripts/tarballs/prefer-configure.sh
index 295b239..c344e48 100755
--- a/scripts/tarballs/prefer-configure.sh
+++ b/scripts/tarballs/prefer-configure.sh
@@ -28,6 +28,12 @@
;;
esac
;;
+strongswan-epdg)
+ # Use a simple git archive instead of running configure and "make dist-bzip2"
+ # The configure script requires tags to be in a specific format and clashs
+ # with our custom tags.
+ exit 1
+ ;;
*)
exit 0
;;
diff --git a/scripts/tarballs/publish-tarballs-for-tags.sh b/scripts/tarballs/publish-tarballs-for-tags.sh
index 46a2e17..a3cbad1 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-epdg
osmo-fl2k
osmo-gbproxy
osmo-ggsn
@@ -46,6 +47,7 @@
osmocom-bb
rtl-sdr
simtrace2
+ strongswan-epdg
"

# Old release tags that are duplicates or where generating the tarball fails

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

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I3445e76f6fd6ebb49ada5dc4320c6b9fa717f00c
Gerrit-Change-Number: 37324
Gerrit-PatchSet: 5
Gerrit-Owner: lynxis lazus <lynxis@fe80.eu>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-MessageType: merged