- gerrit-log - lists.osmocom.org

Change in osmo-ci[master]: scripts/docker-cleanup.sh: conditional img clean

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27156 ) Change subject: scripts/docker-cleanup.sh: conditional img clean ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1cef0833c096de0fa5acf77156bb5dd362e2ef9c Gerrit-Change-Number: 27156 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:38:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: scripts/docker-cleanup.sh: use "docker system prune"

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27155 ) Change subject: scripts/docker-cleanup.sh: use "docker system prune" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27155 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: If441b251de50063f0229d36fb1bc260a4cb1dd87 Gerrit-Change-Number: 27155 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:38:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: scripts/docker-cleanup.sh: delete containers too

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27154 ) Change subject: scripts/docker-cleanup.sh: delete containers too ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27154 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I73b2f13875286c1aaa5424809edab2202f41768b Gerrit-Change-Number: 27154 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:37:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: scripts/docker-cleanup.sh: use set -x

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27153 ) Change subject: scripts/docker-cleanup.sh: use set -x ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27153 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iba170128e55a9778467c3d3bcf33a91321a8c29f Gerrit-Change-Number: 27153 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:37:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: ansible/roles/docker: install docuum

by laforge

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27152 ) Change subject: ansible/roles/docker: install docuum ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27152 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I640b1e607feca87e7a578946ae4b8332ce854ab1 Gerrit-Change-Number: 27152 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 15:37:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: ansible/setup-jenkins-slave: accept rel-change

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27151 ) Change subject: ansible/setup-jenkins-slave: accept rel-change ...................................................................... ansible/setup-jenkins-slave: accept rel-change Fix for: W:This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details. E:Repository 'http://raspbian.raspberrypi.org/raspbian buster InRelease' changed its 'Suite' value from 'stable' to 'oldstable' Related: https://github.com/ansible/ansible/issues/48352 Change-Id: I90ee8dd49001d6810f2118e9feff3375e87052ea --- A ansible/roles/apt-allow-relinfo-change/README.md A ansible/roles/apt-allow-relinfo-change/tasks/main.yml M ansible/setup-jenkins-slave.yml 3 files changed, 21 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ansible/roles/apt-allow-relinfo-change/README.md b/ansible/roles/apt-allow-relinfo-change/README.md new file mode 100644 index 0000000..cd00a46 --- /dev/null +++ b/ansible/roles/apt-allow-relinfo-change/README.md @@ -0,0 +1,12 @@ +--- +When the suite of one debian release changes from stable to oldstable, apt +stops working with the following error: + +``` +W:This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details. +E:Repository 'http://raspbian.raspberrypi.org/raspbian buster InRelease' changed its 'Suite' value from 'stable' to 'oldstable' +``` + +This role configures apt to allow the release info change. + +Related: https://github.com/ansible/ansible/issues/48352 diff --git a/ansible/roles/apt-allow-relinfo-change/tasks/main.yml b/ansible/roles/apt-allow-relinfo-change/tasks/main.yml new file mode 100644 index 0000000..098f5ee --- /dev/null +++ b/ansible/roles/apt-allow-relinfo-change/tasks/main.yml @@ -0,0 +1,7 @@ +--- +- name: "configure to allow release info change" + lineinfile: + path: /etc/apt/apt.conf.d/99relinfochange + state: present + create: yes + line: Acquire::AllowReleaseInfoChange::Suite "true"; diff --git a/ansible/setup-jenkins-slave.yml b/ansible/setup-jenkins-slave.yml index 07414aa..05e3bde 100644 --- a/ansible/setup-jenkins-slave.yml +++ b/ansible/setup-jenkins-slave.yml @@ -15,6 +15,8 @@ cache_valid_time: 3600 update_cache: yes roles: + - name: apt-allow-relinfo-change + - name: docker jenkins_user: osmocom-build tags: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27151 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I90ee8dd49001d6810f2118e9feff3375e87052ea Gerrit-Change-Number: 27151 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: ansible/ansible.cfg: make command output readable

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27150 ) Change subject: ansible/ansible.cfg: make command output readable ...................................................................... ansible/ansible.cfg: make command output readable Have a readable output, instead of the default that wraps the output with stripped new lines inside json. Related: https://github.com/ansible/ansible/issues/27078#issuecomment-364560173 Change-Id: I88d584a1808d82d75906b350e3bffe9bc73a8c67 --- A ansible/ansible.cfg 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg new file mode 100644 index 0000000..11169e6 --- /dev/null +++ b/ansible/ansible.cfg @@ -0,0 +1,2 @@ +[defaults] +stdout_callback=debug -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27150 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I88d584a1808d82d75906b350e3bffe9bc73a8c67 Gerrit-Change-Number: 27150 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-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: lint: catch missing --rm flag for 'docker run'

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27149 ) Change subject: lint: catch missing --rm flag for 'docker run' ...................................................................... lint: catch missing --rm flag for 'docker run' Not having the --rm flag causes docker containers to be stored forever, so make sure we always add it to the "docker run" commands that we run on jenkins via scripts in various repositories. Depends: docker-playground I48b01c43fedf379b8a565eaab0369806d7831bd8 Related: https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up Related: SYS#5827, OS#5099 Change-Id: I8ab9c291504475d670bdefc50c4524c5bdd4c880 --- A lint/docker_run_rm.sh M lint/lint_diff.sh 2 files changed, 35 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/lint/docker_run_rm.sh b/lint/docker_run_rm.sh new file mode 100755 index 0000000..3d6648e --- /dev/null +++ b/lint/docker_run_rm.sh @@ -0,0 +1,17 @@ +#!/bin/sh +# Verify that "docker run" has a "--rm" in the same line or next line, so we +# don't fill up space on jenkins nodes with never deleted containers: +# https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up + +RET=0 + +for i in $(git grep -l '^[^#]*docker run'); do + if [ -z "$(grep -A1 "docker run" "$i" | grep -- "--rm")" ]; then + echo "ERROR: missing --rm after 'docker run' (same line or next line):" + grep --color=always -H -n -A1 "docker run" "$i" + echo + RET=1 + fi +done + +exit $RET diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh index f8daab7..0762f6b 100755 --- a/lint/lint_diff.sh +++ b/lint/lint_diff.sh @@ -19,20 +19,31 @@ fi fi +ERROR=0 + +echo "Running docker_run_rm.sh on the whole tree..." +echo +if ! "$SCRIPT_DIR"/docker_run_rm.sh; then + ERROR=1 +fi + echo "Running checkpatch on 'git diff $COMMIT'..." echo -if git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" - \ +if ! git diff -U0 "$COMMIT" | "$SCRIPT_DIR/checkpatch/checkpatch_osmo.sh" - \ --color=always \ --mailback \ --show-types \ --showfile \ --terse then - exit 0 + ERROR=1 fi -echo -echo "Please fix the linting errors above. More information:" -echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Linting" -echo -exit 1 + +if [ "$ERROR" = 1 ]; then + echo + echo "Please fix the linting errors above. More information:" + echo "https://osmocom.org/projects/cellular-infrastructure/wiki/Linting" + echo + exit 1 +fi -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27149 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I8ab9c291504475d670bdefc50c4524c5bdd4c880 Gerrit-Change-Number: 27149 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: scripts/osmocom-packages-docker: docker run --rm

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27148 ) Change subject: scripts/osmocom-packages-docker: docker run --rm ...................................................................... scripts/osmocom-packages-docker: docker run --rm Change-Id: I357ae8071d27088a2c0a74f962ac1589bff43a70 --- M scripts/osmocom-packages-docker.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/scripts/osmocom-packages-docker.sh b/scripts/osmocom-packages-docker.sh index a7a804b..a541a87 100755 --- a/scripts/osmocom-packages-docker.sh +++ b/scripts/osmocom-packages-docker.sh @@ -25,6 +25,7 @@ esac docker run \ + --rm \ -e "FEED=$FEED" \ -e "OSMO_OBS_CONFLICT_PKGVER=$OSMO_OBS_CONFLICT_PKGVER" \ -e "PACKAGES=$PACKAGES" \ -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27148 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I357ae8071d27088a2c0a74f962ac1589bff43a70 Gerrit-Change-Number: 27148 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-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: editorconfig: new file

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27147 ) Change subject: editorconfig: new file ...................................................................... editorconfig: new file Auto-configure editors with editorconfig plugin installed to indent yaml files with two spaces in this repository. Change-Id: I008ee040e2c15db11a35a061faa4270bacdbd10d --- A .editorconfig 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..23fbc8d --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +; This file is for unifying the coding style for different editors and IDEs. +; See http://editorconfig.org for details. + +# Top-most EditorConfig file. +root = true + +[**/*.yml] +indent_size = 2 +indent_style = space +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I008ee040e2c15db11a35a061faa4270bacdbd10d Gerrit-Change-Number: 27147 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log