Merge "Increase ocata packer timeout from 60m to 75m"

[releng/builder.git] / jjb / opendaylight-infra-cleanup-old-images.sh

diff --git a/jjb/opendaylight-infra-cleanup-old-images.sh b/jjb/opendaylight-infra-cleanup-old-images.sh
index 129ab133624cac2b8ac9d487a5cbd9363b317d3a..6483788bc2b9a8df507a3ec27a576b71a0470684 100644 (file)
--- a/jjb/opendaylight-infra-cleanup-old-images.sh
+++ b/jjb/opendaylight-infra-cleanup-old-images.sh
@@ -1,18 +1,13 @@
 #!/bin/bash
-LFTOOLS_DIR="$WORKSPACE/.venv-lftools"
-if [ ! -d "$LFTOOLS_DIR" ]
-then
-    virtualenv "$LFTOOLS_DIR"
-    # shellcheck disable=SC1090
-    source "$LFTOOLS_DIR/bin/activate"
-    pip install --upgrade pip
-    pip install "lftools>=0.0.10"
-    pip freeze
-fi
-# shellcheck disable=SC1090
-source "$LFTOOLS_DIR/bin/activate"
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
 
-lftools openstack --os-cloud odlpriv-sandbox \
-    image cleanup --hide-public=True \
-                  --days=30 \
-                  --clouds=odlpriv-sandbox,rackspace
+lftools openstack --os-cloud vex \
+    image cleanup --days=30