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
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29155 )
Change subject: jobs/ttcn3: use new packages for 20YYqX testsuite
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29155
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I34050da1e2444cf684ff8bd07673e3268b4dd497
Gerrit-Change-Number: 29155
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 12:54:38 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: osmith.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29154 )
Change subject: jobs/ttcn3: drop obs-mirror workaround for centos8
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29154
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: Ic7920ad71a0cb6362883f8b9ed3dbc9bbb992988
Gerrit-Change-Number: 29154
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 12:53:26 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/29155 )
Change subject: jobs/ttcn3: use new packages for 20YYqX testsuite
......................................................................
jobs/ttcn3: use new packages for 20YYqX testsuite
Drop _MIRROR variables, as both the testsuite packages and the packages
to test are now on downloads.osmocom.org. Previously these variables
were necessary as the testsuite packages were only on
download.opensuse.org (before we set up obs.osmocom.org, which publishes
packages to downloads.osmocom.org).
Change-Id: I34050da1e2444cf684ff8bd07673e3268b4dd497
---
M jobs/ttcn3-testsuites.yml
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/55/29155/1
diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml
index e4de4a5..e8420ec 100644
--- a/jobs/ttcn3-testsuites.yml
+++ b/jobs/ttcn3-testsuites.yml
@@ -436,8 +436,6 @@
export IMAGE_SUFFIX="latest-centos7"
;;
TTCN3-centos-*-20*q*)
- export OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org"
- export OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org"
export OSMOCOM_REPO_PATH="osmo-maintained"
export OSMOCOM_REPO_VERSION="$(echo "{job-name}" | grep -o -P -- "20\d\dq.*$")" # e.g. "2021q1"
export IMAGE_SUFFIX="$OSMOCOM_REPO_VERSION-centos8"
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29155
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I34050da1e2444cf684ff8bd07673e3268b4dd497
Gerrit-Change-Number: 29155
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange