X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=b6397753cb216108d8afda0ba90db04a43581ba8;hb=d22d069117b64cee73be1165861013de9e79ab19;hp=217879e07a9ffd98e74cc0dad7a7f8412db75dc9;hpb=af44374df0c6e82dac61918b5148c57c217a4900;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 217879e0..b6397753 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -1241,6 +1241,8 @@
     openstack-cloud: vex
     openstack-image-cleanup: true
     openstack-image-cleanup-age: 30
+    openstack-image-protect: true
+    openstack-volume-cleanup: true
     stream: master
     submodule-timeout: 10
 
@@ -1285,8 +1287,18 @@
       - lf-infra-pre-build
       - inject:
           properties-content: OS_CLOUD={openstack-cloud}
+      # Volumes
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: '{openstack-volume-cleanup}'
+          steps:
+            - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-volumes.sh
       # Images
-      - shell: !include-raw-escape: ../shell/openstack-protect-in-use-images.sh
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: '{openstack-image-protect}'
+          steps:
+            - shell: !include-raw-escape: ../shell/openstack-protect-in-use-images.sh
       - conditional-step:
           condition-kind: boolean-expression
           condition-expression: '{openstack-image-cleanup}'