- gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: repo-install-test: adjust for obs.osmocom.org
by osmith 19 Aug '22

19 Aug '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29157 ) Change subject: repo-install-test: adjust for obs.osmocom.org ...................................................................... repo-install-test: adjust for obs.osmocom.org Related: OS#5557 Change-Id: Ib53df6c40ae92634e6d93389dcb8a21c48dfb63d --- M scripts/repo-install-test.sh M scripts/repo-install-test/run-inside-docker.sh 2 files changed, 20 insertions(+), 22 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index d34cf6e..2a3e739 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -2,8 +2,8 @@ # Environment variables: # * INTERACTIVE: set to 1 to keep an interactive shell open after the script ran (for debugging) # * FEED: binary package feed (e.g. "latest", "nightly") -# * PROJ: OBS project namespace (e.g. "network:osmocom:latest") -# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "network:osmocom:nightly") +# * PROJ: OBS project namespace (e.g. "osmocom:latest") +# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "osmocom:nightly") # * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development) # * TESTS: which tests to run (all by default, see below for possible values) . "$(dirname "$0")/common.sh" @@ -31,7 +31,7 @@ docker_images_require "$DISTRO-repo-install-test" FEED="${FEED:-nightly}" -PROJ="${PROJ:-network:osmocom:$FEED}" +PROJ="${PROJ:-osmocom:$FEED}" CONTAINER="$DISTRO-repo-install-test-$FEED" if [ -z "$TESTS" ]; then @@ -46,13 +46,13 @@ if [ -z "$PROJ_CONFLICT" ]; then case "$FEED" in latest) - PROJ_CONFLICT="network:osmocom:nightly" + PROJ_CONFLICT="osmocom:nightly" ;; nightly) - PROJ_CONFLICT="network:osmocom:latest" + PROJ_CONFLICT="osmocom:latest" ;; next) - PROJ_CONFLICT="network:osmocom:nightly" + PROJ_CONFLICT="osmocom:nightly" ;; esac fi diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index fec344e..f95bae0 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -1,8 +1,8 @@ #!/bin/sh -ex # Environment variables: # * FEED: binary package feed (e.g. "latest", "nightly") -# * PROJ: OBS project namespace (e.g. "network:osmocom:latest") -# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "network:osmocom:nightly") +# * PROJ: OBS project namespace (e.g. "osmocom:latest") +# * PROJ_CONFLICT: Conflicting OBS project namespace (e.g. "osmocom:nightly") # * KEEP_CACHE: set to 1 to keep downloaded binary packages (for development) # * DISTRO: linux distribution name (e.g. "centos8") # * TESTS: which tests to run (see repo-install-test.sh) @@ -54,12 +54,12 @@ DISTRO_OBSDIR="$(distro_obsdir)" -# $1: OBS project (e.g. "network:osmocom:nightly" -> "network:/osmocom:/nightly") +# $1: OBS project (e.g. "osmocom:nightly" -> "osmocom:/nightly") proj_with_slashes() { echo "$1" | sed "s.:.:/.g" } -# $1: OBS project (e.g. "network:osmocom:nightly" -> "network_osmocom_nightly") +# $1: OBS project (e.g. "osmocom:nightly" -> "osmocom_nightly") proj_with_underscore() { echo "$1" | tr : _ } @@ -96,10 +96,10 @@ fi } -# $1: OBS project (e.g. "network:osmocom:nightly") +# $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_debian() { local proj="$1" - local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/" + local obs_repo="downloads.osmocom.org/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/" echo "Configuring Osmocom repository" @@ -107,7 +107,7 @@ if ! [ -e "$release_key" ]; then apt-get update apt install -y wget - wget -O /tmp/Release.key "https://build.opensuse.org/projects/network:osmocom/public_key" + wget -O /tmp/Release.key "https://obs.osmocom.org/projects/$proj/public_key" fi apt-key add /tmp/Release.key @@ -115,20 +115,20 @@ apt-get update } -# $1: OBS project (e.g. "network:osmocom:nightly") +# $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_debian_remove() { local proj="$1" rm "/etc/apt/sources.list.d/$proj.list" } -# $1: OBS project (e.g. "network:osmocom:nightly") +# $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_centos() { local proj="$1" - local baseurl="https://download.opensuse.org/repositories/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR" + local baseurl="https://downloads.osmocom.org/packages/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR" echo "Configuring Osmocom repository" # Generate this file, based on the feed: - # https://download.opensuse.org/repositories/network:osmocom:latest/CentOS_8/… + # https://downloads.osmocom.org/packages/osmocom:/latest/CentOS_8/osmocom:lat… cat << EOF > "/etc/yum.repos.d/$proj.repo" [$(proj_with_underscore "$proj")] name=$proj @@ -140,13 +140,13 @@ EOF } -# $1: OBS project (e.g. "network:osmocom:nightly") +# $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo_centos_remove() { local proj="$1" rm "/etc/yum.repos.d/$proj.repo" } -# $1: OBS project (e.g. "network:osmocom:nightly") +# $1: OBS project (e.g. "osmocom:nightly") configure_osmocom_repo() { case "$DISTRO" in debian*) @@ -285,14 +285,12 @@ } install_repo_packages_debian() { - local obs="obs://build.opensuse.org/$PROJ/$DISTRO_OBSDIR" - echo "Installing all repository packages" # Get a list of all packages from the repository. Reference: # https://www.debian.org/doc/manuals/aptitude/ch02s04s05.en.html aptitude search -F%p \ - "?origin($obs) ?architecture(native)" | sort \ + "?origin(.*$PROJ.*) ?architecture(native)" | sort \ > osmocom_packages_all.txt filter_packages_txt 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29157 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ib53df6c40ae92634e6d93389dcb8a21c48dfb63d Gerrit-Change-Number: 29157 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

1 0

Change in osmo-ci[master]: repo-install-test: don't use next repository
by osmith 19 Aug '22

19 Aug '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29156 ) Change subject: repo-install-test: don't use next repository ...................................................................... repo-install-test: don't use next repository For the conflict test, don't attempt to install packages from the next feed for centos8. This was useful when we didn't have binary packages for centos8 for latest yet, but we have them now. The next feed existed temporarily and isn't updated anymore for a long time. We did not add it to obs.osmocom.org. This is in preparation for adjusting repo-install-test to use packages from obs.osmocom.org, where we don't have a next feed. Change-Id: I73a6c051c423eb30ddeab1688fc78fe959e60cf4 --- M scripts/repo-install-test.sh 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/scripts/repo-install-test.sh b/scripts/repo-install-test.sh index 6b14cf2..d34cf6e 100755 --- a/scripts/repo-install-test.sh +++ b/scripts/repo-install-test.sh @@ -50,10 +50,6 @@ ;; nightly) PROJ_CONFLICT="network:osmocom:latest" - if [ "$DISTRO" = "centos8" ]; then - # Doesn't have packages built for "latest" yet - PROJ_CONFLICT="network:osmocom:next" - fi ;; next) PROJ_CONFLICT="network:osmocom:nightly" 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 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

1 0

Change in osmo-ci[master]: jobs/ttcn3: use new packages for 20YYqX testsuite
by osmith 19 Aug '22

19 Aug '22

osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved 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" 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 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

1 0

Change in osmo-ci[master]: jobs/ttcn3: drop obs-mirror workaround for centos8
by osmith 19 Aug '22

19 Aug '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29154 ) Change subject: jobs/ttcn3: drop obs-mirror workaround for centos8 ...................................................................... jobs/ttcn3: drop obs-mirror workaround for centos8 Get the centos8 packages directly from the package repository again (https://downloads.osmocom.org/packages/) instead of getting them from the delayed obs-mirror dir (https://downloads.osmocom.org/obs-mirror/). Use the packages generated from obs.osmocom.org for the testsuite too. This reverts 526f1e12d33a2f9edd8419210cb6f036abc00f68 and I8201f34a0f9747eea78c358a626cc3981d7407c4 which set this up to work around sporadically missing metadata files from download.opensuse.org. Change-Id: Ic7920ad71a0cb6362883f8b9ed3dbc9bbb992988 --- M jobs/ttcn3-testsuites.yml 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve neels: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index ba5b298..e4de4a5 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -445,9 +445,6 @@ ;; TTCN3-centos-*) DIR="$(echo "{job-name}" | sed s/^TTCN3-centos\-/ttcn3-/)" - export OSMOCOM_REPO_TESTSUITE_MIRROR="http://download.opensuse.org" - export OSMOCOM_REPO_MIRROR="https://downloads.osmocom.org" - export OSMOCOM_REPO_PATH="obs-mirror/.previous" export IMAGE_SUFFIX="master-centos8" ;; TTCN3-centos7-*) 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- 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: 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

1 0

Change in osmo-ci[master]: jobs/master-builds: clone from gerrit.osmocom.org
by osmith 19 Aug '22

19 Aug '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29153 ) Change subject: jobs/master-builds: clone from gerrit.osmocom.org ...................................................................... jobs/master-builds: clone from gerrit.osmocom.org Work around two issues with cloning from https://git.osmocom.org: * cloning via https from git.osmocom.org is unreliable, leads to lots of mails of failed builds * the cgit mirror of libosmo-gprs.git is out of sync Related: https://lists.osmocom.org/hyperkitty/list/openbsc@lists.osmocom.org/message… Change-Id: I2f345be55f5c7eb42655dc346776ad8891af126d --- M jobs/master-builds.yml 1 file changed, 6 insertions(+), 2 deletions(-) Approvals: neels: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index eb1bf38..6ca3e24 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -46,7 +46,7 @@ wrappers: [] trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org - git_base_url: https://git.osmocom.org + git_base_url: https://gerrit.osmocom.org # in alphabetical order repos: @@ -73,6 +73,7 @@ master-libosmo-netif, master-osmo-bts - libosmo-dsp: + git_base_url: https://gitea.osmocom.org/sdr cmd: | {docker_run} \ {docker_img} sh -ex -c \ @@ -242,7 +243,8 @@ cmd: 'docker pull {docker_img} && {docker_run} {docker_img} /build/contrib/jenkins.sh --publish' email: gerrit-log(a)lists.osmocom.org laforge(a)gnumonks.org kredon(a)sysmocom.de 246tnt(a)gmail.com - - osmo-fl2k + - osmo-fl2k: + git_base_url: https://gitea.osmocom.org/sdr - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] @@ -261,6 +263,7 @@ - osmo-upf - osmo-gmr: + git_base_url: https://gitea.osmocom.org/satellite email: gerrit-log(a)lists.osmocom.org 246tnt(a)gmail.com - osmo-gsm-manuals: @@ -393,6 +396,7 @@ - osmo-hnbgw - rtl-sdr: + git_base_url: https://gitea.osmocom.org/sdr email: laforge(a)gnumonks.org steve(a)steve-m.de - pysim: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2f345be55f5c7eb42655dc346776ad8891af126d Gerrit-Change-Number: 29153 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: jobs/master-builds: clone from gerrit.osmocom.org
by osmith 19 Aug '22

19 Aug '22

Attention is currently required from: laforge, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29153 ) Change subject: jobs/master-builds: clone from gerrit.osmocom.org ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2f345be55f5c7eb42655dc346776ad8891af126d Gerrit-Change-Number: 29153 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Aug 2022 14:08:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: jobs/master-builds: clone from gerrit.osmocom.org
by neels 19 Aug '22

19 Aug '22

Attention is currently required from: osmith, laforge, daniel. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29153 ) Change subject: jobs/master-builds: clone from gerrit.osmocom.org ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/29153/comment/5806f3b5_948c1d48 PS2, Line 76: git_base_url: https://gitea.osmocom.org/sdr > fatal: repository 'https://gitea.osmocom. […] sorry https://gitea.osmocom.org/sdr/libosmo-dsp -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2f345be55f5c7eb42655dc346776ad8891af126d Gerrit-Change-Number: 29153 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Aug 2022 14:05:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: jobs/master-builds: clone from gerrit.osmocom.org
by osmith 19 Aug '22

19 Aug '22

Attention is currently required from: neels, laforge, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29153 ) Change subject: jobs/master-builds: clone from gerrit.osmocom.org ...................................................................... Patch Set 2: (1 comment) File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/29153/comment/bd9a4830_c022d612 PS2, Line 76: git_base_url: https://gitea.osmocom.org/sdr > fatal: repository 'https://gitea.osmocom. […] it is the git base url, jenkins will clone from https://gitea.osmocom.org/sdr/libosmo-dsp -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2f345be55f5c7eb42655dc346776ad8891af126d Gerrit-Change-Number: 29153 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Aug 2022 14:04:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: jobs/master-builds: clone from gerrit.osmocom.org
by neels 19 Aug '22

19 Aug '22

Attention is currently required from: osmith, laforge, daniel. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29153 ) Change subject: jobs/master-builds: clone from gerrit.osmocom.org ...................................................................... Patch Set 2: Code-Review-1 (1 comment) File jobs/master-builds.yml: https://gerrit.osmocom.org/c/osmo-ci/+/29153/comment/60ccb7a4_7a7e34d3 PS2, Line 76: git_base_url: https://gitea.osmocom.org/sdr fatal: repository 'https://gitea.osmocom.org/sdr/' not found -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2f345be55f5c7eb42655dc346776ad8891af126d Gerrit-Change-Number: 29153 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Aug 2022 14:03:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: obs: meaningful error if debian/changelog is empty
by osmith 19 Aug '22

19 Aug '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/29097 ) Change subject: obs: meaningful error if debian/changelog is empty ...................................................................... obs: meaningful error if debian/changelog is empty If there's an empty debian/changelog, packaging needs to be fixed in the git repository of the project. Print a meaningful error instead of: File "/obs/lib/srcpkg.py", line 68, in get_version_for_feed if ":" in ret: TypeError: argument of type 'NoneType' is not iterable Change-Id: I294d844ccccfa12599b6ba1def087e4a32d289e7 --- M scripts/obs/lib/debian.py M scripts/obs/lib/srcpkg.py 2 files changed, 6 insertions(+), 8 deletions(-) Approvals: neels: Looks good to me, approved daniel: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/obs/lib/debian.py b/scripts/obs/lib/debian.py index 89153fb..3bba3ec 100644 --- a/scripts/obs/lib/debian.py +++ b/scripts/obs/lib/debian.py @@ -73,14 +73,15 @@ repo_path = lib.git.get_repo_path(project) changelog_path = f"{repo_path}/debian/changelog" - if not os.path.exists(changelog_path): - return None + assert os.path.exists(changelog_path), f"{project}: missing debian/changelog" changelog = open(changelog_path).read() - if not changelog: - return None + assert changelog, f"{project}: debian/changelog is empty" - return changelog.split("(", 1)[1].split(")", 1)[0] + ret = changelog.split("(", 1)[1].split(")", 1)[0] + assert ret, f"{project}: couldn't find last version in debian/changelog" + + return ret def changelog_add_entry_if_needed(project, feed, version): diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index baf64a9..035cf81 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -70,9 +70,6 @@ if ":" in ret: ret = ret.split(":")[1] - if not ret: - ret = "0.0.0" - # Append the conflict_version to increase the version even if the commit # did not change (OS#5135) if conflict_version: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/29097 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I294d844ccccfa12599b6ba1def087e4a32d289e7 Gerrit-Change-Number: 29097 Gerrit-PatchSet: 4 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log