Allow image protection script to be disabled

Change-Id: Ie15fc59fba1a4efc475136bf30ed4c94045203d2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/.jjb-test/lf-ci-jobs/openstack-cron-full.yaml b/.jjb-test/lf-ci-jobs/openstack-cron-full.yaml
index d4bc05c..0dc4aaa 100644 (file)
--- a/.jjb-test/lf-ci-jobs/openstack-cron-full.yaml
+++ b/.jjb-test/lf-ci-jobs/openstack-cron-full.yaml
@@ -8,3 +8,4 @@
     openstack-cloud: example-cloud
     openstack-image-cleanup: false
     openstack-image-cleanup-age: 42
+    openstack-image-protect: false

diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst
index f768634..57aebc6 100644 (file)
--- a/docs/jjb/lf-ci-jobs.rst
+++ b/docs/jjb/lf-ci-jobs.rst
@@ -574,6 +574,8 @@ containing the credentials for the cloud.
         (default: true)
     :openstack-image-cleanup-age: Age in days of image before marking it for
         removal. (default: 30)
+    :openstack-image-protect: Whether or not to run the image protect script.
+        (default: true)
     :stream: Keyword that can be used to represent a release code-name.
         Often the same as the branch. (default: master)
     :submodule-recursive: Whether to checkout submodules recursively.

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 217879e..2ede3e7 100644 (file)
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -1241,6 +1241,7 @@
     openstack-cloud: vex
     openstack-image-cleanup: true
     openstack-image-cleanup-age: 30
+    openstack-image-protect: true
     stream: master
     submodule-timeout: 10
 
@@ -1286,7 +1287,11 @@
       - inject:
           properties-content: OS_CLOUD={openstack-cloud}
       # 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}'