February 2022 - gerrit-log - lists.osmocom.org

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27152 ) Change subject: ansible/roles/docker: install docuum ...................................................................... ansible/roles/docker: install docuum Allow setting a max amount of space that docker images should take up, and delete the least recently used images when the amount is exceeded. Related: https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up Change-Id: I640b1e607feca87e7a578946ae4b8332ce854ab1 --- M ansible/roles/docker/defaults/main.yml A ansible/roles/docker/files/Dockerfile A ansible/roles/docker/files/docuum.service A ansible/roles/docker/files/docuum.sh A ansible/roles/docker/tasks/docuum.yml M ansible/roles/docker/tasks/main.yml 6 files changed, 134 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/52/27152/1 diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml index 2c03d90..24b13c2 100644 --- a/ansible/roles/docker/defaults/main.yml +++ b/ansible/roles/docker/defaults/main.yml @@ -2,3 +2,7 @@ # Adds this user to the group docker which is allowed to access docker jenkins_user: jenkins + +# Keep amount of stored docker images below this size +# https://osmocom.org/projects/osmocom-servers/wiki/Docker_cache_clean_up +docker_max_image_space: "100 GB" diff --git a/ansible/roles/docker/files/Dockerfile b/ansible/roles/docker/files/Dockerfile new file mode 100644 index 0000000..85379c3 --- /dev/null +++ b/ansible/roles/docker/files/Dockerfile @@ -0,0 +1,31 @@ +ARG REGISTRY=docker.io +FROM ${REGISTRY}/alpine:3.15 +ARG DOCKER_GID + +RUN apk add \ + cargo \ + docker-cli + +# Create user and docker group with same group-id as on host system, create +# /opt/docuum dir owned by user +RUN set -x && \ + delgroup $(getent group "${DOCKER_GID}" | cut -d: -f1) && \ + addgroup -g "${DOCKER_GID}" docker && \ + adduser -D -u 1000 -G docker user && \ + mkdir /opt/docuum && \ + chown user /opt/docuum + +USER user + +ARG DOCUUM_VER=0.20.4 + +RUN set -x && \ + cd /opt/docuum && \ + wget https://github.com/stepchowfun/docuum/archive/refs/tags/v${DOCUUM_VER}.tar.… \ + -O docuum.tar.gz && \ + tar -xf docuum.tar.gz && \ + cd docuum-${DOCUUM_VER} && \ + cargo build --release && \ + cd .. && \ + mv docuum-${DOCUUM_VER}/target/release/docuum . && \ + rm -rf ~/.cargo docuum-${DOCUUM_VER} docuum.tar.gz diff --git a/ansible/roles/docker/files/docuum.service b/ansible/roles/docker/files/docuum.service new file mode 100644 index 0000000..8c62973 --- /dev/null +++ b/ansible/roles/docker/files/docuum.service @@ -0,0 +1,11 @@ +[Unit] +Description=Docuum +After=docker.service +Wants=docker.service + +[Service] +ExecStart=/opt/docuum/docuum.sh +Restart=on-failure + +[Install] +WantedBy=multi-user.target diff --git a/ansible/roles/docker/files/docuum.sh b/ansible/roles/docker/files/docuum.sh new file mode 100755 index 0000000..e7d5e28 --- /dev/null +++ b/ansible/roles/docker/files/docuum.sh @@ -0,0 +1,43 @@ +#!/bin/sh -ex + +# Maximum amount of storage that docker images may consume +THRESHOLD="$(cat /opt/docuum/docker_max_image_space)" + +DIR="$(dirname "$(realpath "$0")")" +IMG="osmo-ci-docuum" +DOCUUM_UID="1000" +DOCKER_GID="$(getent group docker | cut -d : -f 3)" +PULL_ARG="" + +if [ -z "$THRESHOLD" ]; then + set +x + echo "ERROR: failed to read threshold from /opt/docuum/docker_max_image_space" + exit 1 +fi + +if [ "$INITIAL_BUILD" = 1 ]; then + PULL_ARG="--pull" +fi + +mkdir -p /var/cache/docuum +chown "$DOCUUM_UID" /var/cache/docuum + +cd "$DIR" +docker build \ + --build-arg DOCKER_GID="$DOCKER_GID" \ + $PULL_ARG \ + -t "$IMG" \ + . + +if [ "$INITIAL_BUILD" = 1 ]; then + exit 0 +fi + +docker run \ + --rm \ + --init \ + --name docuum \ + -v /var/run/docker.sock:/var/run/docker.sock \ + -v /var/cache/docuum:/home/user \ + "$IMG" \ + sh -c "exec /opt/docuum/docuum --threshold '$THRESHOLD'" diff --git a/ansible/roles/docker/tasks/docuum.yml b/ansible/roles/docker/tasks/docuum.yml new file mode 100644 index 0000000..7c9ab73 --- /dev/null +++ b/ansible/roles/docker/tasks/docuum.yml @@ -0,0 +1,39 @@ +--- +- name: "docuum : set docker_max_image_space to {{ docker_max_image_space }}" + lineinfile: + path: /opt/docuum/docker_max_image_space + state: present + create: yes + line: "{{ docker_max_image_space }}" + +- name: "docuum : copy Dockerfile" + copy: + src: Dockerfile + dest: /opt/docuum/ + mode: 0644 + +- name: "docuum : copy docuum.sh" + copy: + src: docuum.sh + dest: /opt/docuum/ + mode: 0755 + +- name: "docuum : build container" + shell: INITIAL_BUILD=1 /opt/docuum/docuum.sh + +- name: "docuum : copy docuum.service" + copy: + src: docuum.service + dest: /lib/systemd/system/docuum.service + register: docuumservice + +- name: "docuum : systemctl daemon-reload" + systemd: + daemon_reload: yes + when: docuumservice is changed + +- name: "docuum : ensure the systemd service is installed" + systemd: + name: docuum.service + state: started + enabled: yes diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index a268d2b..97df86a 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -40,6 +40,7 @@ - name: cleanup old docker images cron: name: cleanup-docker-images + disabled: false minute: 0 hour: '*/3' user: "{{ jenkins_user }}" @@ -50,3 +51,8 @@ src: daemon.json dest: /etc/docker/daemon.json notify: restart docker + +# After docker is set up, add docuum to clean old docker images +# x86_64 only, as the raspberries need to be upgraded before they can use recent docker images (OS#5453) +- include: docuum.yml + when: ansible_architecture == 'x86_64' -- 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/47/27147/1 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/48/27148/1 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/49/27149/1 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: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Test RAB Assignment ReleaseRequest

by daniel

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 ) Change subject: hnbgw: Test RAB Assignment ReleaseRequest ...................................................................... Patch Set 1: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120/comment/836cbb55_a641… PS1, Line 904: alt { > This was already in some previous patch. […] Done in merged commit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90d4b1d335a32ab6e2590616149f3a34825d2046 Gerrit-Change-Number: 27120 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:29:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Test RAB Assignment ReleaseRequest

by daniel

daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 ) Change subject: hnbgw: Test RAB Assignment ReleaseRequest ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27120 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I90d4b1d335a32ab6e2590616149f3a34825d2046 Gerrit-Change-Number: 27120 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Match on connection IP/port in CRCX/MDCX

by daniel

daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27118 ) Change subject: hnbgw: Match on connection IP/port in CRCX/MDCX ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27118 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I465a677a29bf4e7a95245d480a241bd840eea75f Gerrit-Change-Number: 27118 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Use helper function for the rab assignment

by daniel

daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27116 ) Change subject: hnbgw: Use helper function for the rab assignment ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27116 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I95625796ee3c75e36637794018e5db27d022dddb Gerrit-Change-Number: 27116 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Check for DLCX on Iu Release as well

by daniel

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115 ) Change subject: hnbgw: Check for DLCX on Iu Release as well ...................................................................... Patch Set 1: (1 comment) File hnbgw/HNBGW_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115/comment/3aab31a4_90e9… PS1, Line 844: repeat; > You could probably simply do […] Done in merged commit -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id53e99e51dbc6b9af67503ba6ecbc8990a7de4c9 Gerrit-Change-Number: 27115 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 14:29:17 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: hnbgw: Check for DLCX on Iu Release as well

by daniel

daniel has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115 ) Change subject: hnbgw: Check for DLCX on Iu Release as well ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27115 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id53e99e51dbc6b9af67503ba6ecbc8990a7de4c9 Gerrit-Change-Number: 27115 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: abandon

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022