Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-ci/+/37521?usp=email
to look at the new patch set (#2).
Change subject: OBS: lib/debian: generate valid strongswan version
......................................................................
OBS: lib/debian: generate valid strongswan version
Ensure debian versions start with a number. For strongswan versions that
look like "osmo-epdg-0.1.1", adjust them to be like "0.1.1-osmo-epdg".
Fix for:
dpkg-buildpackage: error: version number does not start with digit
Related: OS#6488
Change-Id: If535af23bca3a31f71daeade4d8b52403f7f7e17
---
M scripts/obs/lib/debian.py
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/37521/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37521?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: If535af23bca3a31f71daeade4d8b52403f7f7e17
Gerrit-Change-Number: 37521
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37521?usp=email )
Change subject: lib/debian: generate valid versions for strongswan
......................................................................
lib/debian: generate valid versions for strongswan
Ensure debian versions start with a number. For strongswan versions that
look like "osmo-epdg-0.1.1", adjust them to be like "0.1.1-osmo-epdg".
Fix for:
dpkg-buildpackage: error: version number does not start with digit
Related: OS#6488
Change-Id: If535af23bca3a31f71daeade4d8b52403f7f7e17
---
M scripts/obs/lib/debian.py
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/37521/1
diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py
index efe4ff3..1e48046 100644
--- a/scripts/obs/lib/debian.py
+++ b/scripts/obs/lib/debian.py
@@ -112,6 +112,10 @@
# from wireshark. Don't abort here if that is the case.
pass
+ # Debian versions must start with a digit
+ if version.startswith("osmo-epdg-"):
+ version = f"{version.replace('osmo-epdg-', '', 1)}-osmo-epdg"
+
if version_changelog == version:
return
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37521?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: If535af23bca3a31f71daeade4d8b52403f7f7e17
Gerrit-Change-Number: 37521
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/37520?usp=email )
Change subject: jobs/osmocom-build-tags…: fix workspace clean
......................................................................
jobs/osmocom-build-tags…: fix workspace clean
As this job tries to archive the build logs after running, don't remove
the entire workspace. Instead remove the paths that take up the most
space, which are the one with the git clones and build artifacts (_deps)
as well as the one with the temporary installation dirs (_temp/_inst*).
Fixes: b20e8e8b ("jobs/various: clean workspace on success")
Change-Id: Ied86ba80b38a9b10a7a96631e6dedee9f3762c3b
---
M jobs/osmocom-build-tags-against-master.yml
1 file changed, 19 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/20/37520/1
diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml
index 8ae4a63..b242103 100644
--- a/jobs/osmocom-build-tags-against-master.yml
+++ b/jobs/osmocom-build-tags-against-master.yml
@@ -33,8 +33,10 @@
"$USER/debian-bookworm-build" \
scripts/osmocom-build-old-tags-against-master.sh
- # Remove workspace on success to free up space
- rm -rf "$WORKSPACE"
+ # Remove git repos and build results on success to free up space
+ # Logs are kept
+ rm -rf "$WORKSPACE"/_deps
+ rm -rf "$WORKSPACE"/_temp/_inst*
scm:
- git:
branches:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37520?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: Ied86ba80b38a9b10a7a96631e6dedee9f3762c3b
Gerrit-Change-Number: 37520
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37505?usp=email )
Change subject: gerrit-verifications-dahdi: set concurrent: false
......................................................................
gerrit-verifications-dahdi: set concurrent: false
Each of the gerrit-dahdi-linux-* jobs has a 3-4 GiB workspace directory
with a full linux tree. We keep them on disk so we don't need to clone
the linux tree with each build.
This makes sense, but set concurrent to false to not create more of
these than necessary. These directories stood out when investigating
why build4 was running out of space.
Change-Id: I4fd4e85f0930b15b6c67e70fb2c140392c910bf5
---
M jobs/gerrit-verifications-dahdi.yml
1 file changed, 23 insertions(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/jobs/gerrit-verifications-dahdi.yml b/jobs/gerrit-verifications-dahdi.yml
index 5a8b3a6..2cf9e95 100644
--- a/jobs/gerrit-verifications-dahdi.yml
+++ b/jobs/gerrit-verifications-dahdi.yml
@@ -23,7 +23,12 @@
name: 'gerrit-dahdi-linux-{type}-{linux-ver}'
project-type: freestyle
node: osmocom-gerrit
- concurrent: true
+ # These jobs need an entire linux tree. We try to avoid cloning it more
+ # often than necessary, therefore we keep the workspace directory between
+ # job runs. Jenkins creates a new workspace for each concurrent job, which
+ # ends up consuming a lot of disk space so we disable it here. Besides disk
+ # space considerations, this job would run fine concurrently.
+ concurrent: false
retry-count: 0 # scm checkout
properties:
- build-discarder:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37505?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: I4fd4e85f0930b15b6c67e70fb2c140392c910bf5
Gerrit-Change-Number: 37505
Gerrit-PatchSet: 3
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