osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 )
Change subject: jenkins-build-common: use 'git submodule update'
......................................................................
Patch Set 1: Verified+1
(1 comment)
Patchset:
PS1:
jenkins failure is unrelated. This patch is needed to fix the osmo-gsm-tester_build-osmo-trx jenkins job which has been failing.
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3
Gerrit-Change-Number: 30781
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 23 Dec 2022 14:47:38 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781 )
Change subject: jenkins-build-common: use 'git submodule update'
......................................................................
jenkins-build-common: use 'git submodule update'
Now that we use git submodules in osmo-trx, make sure to initialize and
update them before attempting to build.
Fix for:
Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist
Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3
---
M contrib/jenkins-build-common.sh
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/81/30781/1
diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh
index 4a17d4d..b41fc05 100644
--- a/contrib/jenkins-build-common.sh
+++ b/contrib/jenkins-build-common.sh
@@ -102,6 +102,8 @@
echo "$(git rev-parse HEAD) $repo" >> "$prefix_real/${name}_git_hashes.txt"
+ git submodule update --init
+
cd "$base"
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/30781
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Change-Id: Ic2b9207b942a8a9edff82737117b2ed9d6d3cfe3
Gerrit-Change-Number: 30781
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/30777 )
Change subject: mslookup: use apn functions from libosmocore
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/30777
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I09d3c617fd6eb4075084ee106d3f3c5803861d2f
Gerrit-Change-Number: 30777
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 23 Dec 2022 14:20:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30779 )
Change subject: obs: put git submodules into source packages
......................................................................
obs: put git submodules into source packages
We started using git submodules with osmo-trx. Adjust the obs scripts
to actually make the git submodules part of the source packages.
Note that this didn't fail in jenkins before with the rpm build
verification, as jenkins updates git submodules on its own.
Fix for:
[ 165s] Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist
Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3
---
M scripts/obs/lib/git.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py
index 8081a54..db1509b 100644
--- a/scripts/obs/lib/git.py
+++ b/scripts/obs/lib/git.py
@@ -56,6 +56,8 @@
lib.run_cmd(["git", "checkout", "-f", branch], cwd=repo_path)
print(f"{project}: 'git reset --hard {branch}'")
lib.run_cmd(["git", "reset", "--hard", branch], cwd=repo_path)
+ print(f"{project}: 'git submodule update --init'")
+ lib.run_cmd(["git", "submodule", "update", "--init"], cwd=repo_path)
def checkout_from_review(project, gerrit_id):
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30779
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3
Gerrit-Change-Number: 30779
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30779 )
Change subject: obs: put git submodules into source packages
......................................................................
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
merging this now, as this is trivial and required to fix the osmocom:master repository.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30779
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3
Gerrit-Change-Number: 30779
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 23 Dec 2022 14:19:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30779 )
Change subject: obs: put git submodules into source packages
......................................................................
obs: put git submodules into source packages
We started using git submodules with osmo-trx. Adjust the obs scripts
to actually make the git submodules part of the source packages.
Note that this didn't fail in jenkins before with the rpm build
verification, as jenkins updates git submodules on its own.
Fix for:
[ 165s] Makefile.am:32: error: required directory ./osmocom-bb/src/host/trxcon does not exist
Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3
---
M scripts/obs/lib/git.py
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/79/30779/1
diff --git a/scripts/obs/lib/git.py b/scripts/obs/lib/git.py
index 8081a54..db1509b 100644
--- a/scripts/obs/lib/git.py
+++ b/scripts/obs/lib/git.py
@@ -56,6 +56,8 @@
lib.run_cmd(["git", "checkout", "-f", branch], cwd=repo_path)
print(f"{project}: 'git reset --hard {branch}'")
lib.run_cmd(["git", "reset", "--hard", branch], cwd=repo_path)
+ print(f"{project}: 'git submodule update --init'")
+ lib.run_cmd(["git", "submodule", "update", "--init"], cwd=repo_path)
def checkout_from_review(project, gerrit_id):
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30779
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I51b423f3885d6ead5c21a83bdf8ef6051dc34fe3
Gerrit-Change-Number: 30779
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange