Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29156 )
Change subject: repo-install-test: don't use next repository
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29156
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I73a6c051c423eb30ddeab1688fc78fe959e60cf4
Gerrit-Change-Number: 29156
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 18 Aug 2022 13:28:29 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29150 )
Change subject: obs: checkout_for_feed + fetch: fix for 2022q1 etc
......................................................................
obs: checkout_for_feed + fetch: fix for 2022q1 etc
As Neels pointed out, with the current code the 2022q1 and similar feeds
do not get checked out properly if:
* the repository was not freshly cloned (like jenkins would do)
* the repository was fetched (--git-fetch)
Instead of the last revision of that branch from origin, we get the
revision that was previously checked out on the branch. Fix this by
prepending origin/.
Change-Id: I2e265fc84abd4596c386bb56cbabb2af121dc7ca
---
M scripts/obs/lib/srcpkg.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
neels: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index ec29581..92c3aa7 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -16,7 +16,7 @@
elif feed == "nightly":
lib.git.checkout_default_branch(project)
else: # 2022q1 etc
- lib.git.checkout(project, feed)
+ lib.git.checkout(project, f"origin/{feed}")
def get_git_version_gen_path(project):
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29150
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2e265fc84abd4596c386bb56cbabb2af121dc7ca
Gerrit-Change-Number: 29150
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29151 )
Change subject: obs: make git fetch the default
......................................................................
obs: make git fetch the default
As discussed with Neels, it makes more sense to fetch git repos by
default.
Change-Id: Ib8adfbcf59d66b26f322ad22b2df1ccbeaf15af7
---
M jobs/osmocom-obs.yml
M scripts/obs/README
M scripts/obs/lib/__init__.py
3 files changed, 4 insertions(+), 9 deletions(-)
Approvals:
neels: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml
index cb8cef1..06b4ecb 100644
--- a/jobs/osmocom-obs.yml
+++ b/jobs/osmocom-obs.yml
@@ -38,7 +38,6 @@
--conflict-version {conflict_version} \
--docker \
--feed {type} \
- --git-fetch \
--meta \
{proj}:{type}
scm:
diff --git a/scripts/obs/README b/scripts/obs/README
index 6d18f7d..d9499d8 100644
--- a/scripts/obs/README
+++ b/scripts/obs/README
@@ -88,11 +88,7 @@
--------------------------------------
cd ~/osmo-dev/src/osmo-ci/scripts/obs/
- ./update_obs_project.py -g -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw
-
-The -g option ensures that the latest branch tip is fetched from Osmocom's git.
-Without it, the cached git repository will stay stuck on its currently checked
-out branch version -- you will keep submitting the same state.
+ ./update_obs_project.py -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw
The -b option chooses a custom branch to build. It is important to prepend
'origin/' to 'your/branch', so that repeated dev cycles use the latest branch
diff --git a/scripts/obs/lib/__init__.py b/scripts/obs/lib/__init__.py
index b490ae8..a07a072 100644
--- a/scripts/obs/lib/__init__.py
+++ b/scripts/obs/lib/__init__.py
@@ -27,9 +27,9 @@
parser.add_argument("-d", "--docker",
help="run in docker to avoid installing required pkgs",
action="store_true")
- parser.add_argument("-g", "--git-fetch",
- help="fetch already cloned git repositories",
- action="store_true")
+ parser.add_argument("-s", "--git-skip-fetch",
+ help="do not fetch already cloned git repositories",
+ action="store_false", dest="git_fetch")
parser.add_argument("-m", "--meta", action="store_true",
help="build a meta package (e.g. osmocom-nightly)")
parser.add_argument("-c", "--conflict-version", nargs="?",
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29151
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ib8adfbcf59d66b26f322ad22b2df1ccbeaf15af7
Gerrit-Change-Number: 29151
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29152 )
Change subject: obs: prepend origin/ to branch selected with -b
......................................................................
obs: prepend origin/ to branch selected with -b
Doing this makes more sense and is less prone to errors.
Change-Id: I2fa9c457e0e17cdd1b5946dc27ae232ec13bfa25
---
M scripts/obs/README
M scripts/obs/lib/srcpkg.py
2 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
neels: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/scripts/obs/README b/scripts/obs/README
index d9499d8..67d2a2b 100644
--- a/scripts/obs/README
+++ b/scripts/obs/README
@@ -88,11 +88,9 @@
--------------------------------------
cd ~/osmo-dev/src/osmo-ci/scripts/obs/
- ./update_obs_project.py -b origin/neels/pkg home:nhofmeyr:test osmo-hnbgw
+ ./update_obs_project.py -b neels/pkg home:nhofmeyr:test osmo-hnbgw
-The -b option chooses a custom branch to build. It is important to prepend
-'origin/' to 'your/branch', so that repeated dev cycles use the latest branch
-tip that was fetched instead staying stuck on the local branch.
+The -b option chooses a custom branch to build.
See results
diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py
index 92c3aa7..baf64a9 100644
--- a/scripts/obs/lib/srcpkg.py
+++ b/scripts/obs/lib/srcpkg.py
@@ -10,7 +10,7 @@
def checkout_for_feed(project, feed, branch=None):
""" checkout a commit, either latest tag or master or 20YY branch """
if branch:
- lib.git.checkout(project, branch)
+ lib.git.checkout(project, f"origin/{branch}")
elif feed == "latest":
lib.git.checkout_latest_tag(project)
elif feed == "nightly":
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29152
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2fa9c457e0e17cdd1b5946dc27ae232ec13bfa25
Gerrit-Change-Number: 29152
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: neels.
osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29152 )
Change subject: obs: prepend origin/ to branch selected with -b
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
> ok, though this makes it impossible to work directly in the _cache/repos dir? […]
yes, but setting another local git repository as origin as you described in the README works well and has several advantages
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29152
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2fa9c457e0e17cdd1b5946dc27ae232ec13bfa25
Gerrit-Change-Number: 29152
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 18 Aug 2022 13:18:20 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: comment
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/o…
Package network:osmocom:nightly/osmo-upf failed to build in openSUSE_Tumbleweed/i586
Check out the package for editing:
osc checkout network:osmocom:nightly osmo-upf
Last lines of build log:
[ 38s] checking whether to build static libraries... yes
[ 38s] checking for pkg-config... /usr/bin/pkg-config
[ 38s] checking for i586-suse-linux-gnu-pkg-config... /usr/bin/i586-suse-linux-gnu-pkg-config
[ 38s] checking pkg-config is at least version 0.20... yes
[ 38s] checking for LIBOSMOCORE... yes
[ 38s] checking for LIBOSMOVTY... yes
[ 38s] checking for LIBOSMOCTRL... yes
[ 38s] checking for LIBOSMOGTLV... no
[ 38s] configure: error: Package requirements (libosmo-gtlv >= 0.1.0) were not met:
[ 38s]
[ 38s] Package 'libosmo-gtlv', required by 'virtual:world', not found
[ 38s]
[ 38s] Consider adjusting the PKG_CONFIG_PATH environment variable if you
[ 38s] installed software in a non-standard prefix.
[ 38s]
[ 38s] Alternatively, you may set the environment variables LIBOSMOGTLV_CFLAGS
[ 38s] and LIBOSMOGTLV_LIBS to avoid the need to call pkg-config.
[ 38s] See the pkg-config man page for more details.
[ 38s] error: Bad exit status from /var/tmp/rpm-tmp.5IFCMH (%build)
[ 38s]
[ 38s] RPM build errors:
[ 38s] Bad exit status from /var/tmp/rpm-tmp.5IFCMH (%build)
[ 39s] ### VM INTERACTION START ###
[ 39s] [ 33.153358][ T1] sysrq: Power Off
[ 39s] [ 33.160090][ T100] reboot: Power down
[ 39s] ### VM INTERACTION END ###
[ 39s]
[ 39s] lamb20 failed "build osmo-upf.spec" at Thu Aug 18 13:13:18 UTC 2022.
[ 39s]
--
Configure notifications at https://build.opensuse.org/my/subscriptions
openSUSE Build Service (https://build.opensuse.org/)
Attention is currently required from: osmith.
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29152 )
Change subject: obs: prepend origin/ to branch selected with -b
......................................................................
Patch Set 1: Code-Review+1
(1 comment)
Patchset:
PS1:
ok, though this makes it impossible to work directly in the _cache/repos dir?
fine with me.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29152
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I2fa9c457e0e17cdd1b5946dc27ae232ec13bfa25
Gerrit-Change-Number: 29152
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 18 Aug 2022 13:10:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment