Move image delete command to cleanup

.gitlab-ci.yml

@@ -301,7 +301,7 @@ test_ood_image:
       if [ "$FAILED" = true ]; then
         if [ "${DELETE_WHEN_FAILED-true}" = true ]; then
           openstack server delete $NEW_INSTANCE_ID
-          openstack image delete $BUILT_OOD_IMAGE_ID
+          echo "DELETE_BUILT_IMAGE=true" | tee -a instance.env
         fi
         false
       fi
@@ -456,6 +456,10 @@ cleanup_integration:
   script:
     - OS_PROJECT_ID=$(openstack application credential show $OS_APPLICATION_CREDENTIAL_ID -f value -c project_id)
     - openstack image list --sort-column Name --sort-descending -f value -c Name -c ID --property owner=$OS_PROJECT_ID > images.txt
+    - |
+      if [ "${DELETE_BUILT_IMAGE-false}" = true ]; then
+        openstack image delete $BUILT_OOD_IMAGE_ID
+      fi
     - >
       OOD_IMAGE_TO_BE_DELETE=($(cat images.txt
       | awk -v NITK=$NUM_IMAGE_TO_KEEP -v REGEX=ood-$TIMESTAMP_REGEX