laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28145 ) Change subject: docker: Fix vfs storage cleanup task ...................................................................... docker: Fix vfs storage cleanup task The 'grep' logic of Change-Id I58f3f4a26ad6fa4698d87475cefb6ab21e66b15a seems to be inverted. if "overlay2" is found (grep successful) the exit code of grep is '0'. Change-Id: I334b0c71ef626ffd2c84097e902a5164faa3fa8b Related: OS#5827 --- M ansible/roles/docker/tasks/main.yml A ansible/vars/Debian-11.yml 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 7c7fe85..e6e6d9f 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -54,7 +54,7 @@ # daemon.json configures overlay2 storage driver, clean up vfs leftovers - name: cleanup vfs storage dir - shell: "docker info | grep -q 'Storage Driver: overlay2' && rm -rf /var/lib/docker/vfs" + shell: "docker info | grep -q 'Storage Driver: overlay2' || rm -rf /var/lib/docker/vfs" # 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) diff --git a/ansible/vars/Debian-11.yml b/ansible/vars/Debian-11.yml new file mode 100644 index 0000000..8361e15 --- /dev/null +++ b/ansible/vars/Debian-11.yml @@ -0,0 +1,2 @@ +--- +obs_distro: Debian_11 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I334b0c71ef626ffd2c84097e902a5164faa3fa8b Gerrit-Change-Number: 28145 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged