From e7164a28f4024f82b544864bad6bfc19b6a112cb Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Fri, 23 Jan 2015 23:01:01 +0300 Subject: [PATCH] Use general cleanup for Heat jobs Heat doesn't properly delete all stack resources sometimes, so use general cleanup Change-Id: Ia135d006c24b2c383eee1c9339e4cd91f3dcd4cf --- slave-scripts/integration-cleanup.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/slave-scripts/integration-cleanup.sh b/slave-scripts/integration-cleanup.sh index 47c05cf8..0ef09400 100644 --- a/slave-scripts/integration-cleanup.sh +++ b/slave-scripts/integration-cleanup.sh @@ -31,14 +31,14 @@ if [ $JOB_TYPE == 'dib' ]; then if [ "$HADOOP_VERSION" == '1' ]; then python cleanup.py cleanup .*$HOST-$os-$HADOOP_VERSION-$PREV_BUILD-vanilla.* elif [ "$HADOOP_VERSION" == '2.4' ]; then - python cleanup.py cleanup-heat .*$HOST-$os-2-4-$PREV_BUILD-vanilla-v2.* + python cleanup.py cleanup .*$HOST-$os-2-4-$PREV_BUILD-vanilla-v2.* else - python cleanup.py cleanup-heat .*$HOST-$os-2-6-$PREV_BUILD-vanilla-v2.* + python cleanup.py cleanup .*$HOST-$os-2-6-$PREV_BUILD-vanilla-v2.* fi elif [ $PLUGIN == 'hdp_1' ]; then python cleanup.py cleanup .*$HOST-cos-1-$PREV_BUILD-hdp.* elif [ $PLUGIN == 'hdp_2' ]; then - python cleanup.py cleanup-heat .*$HOST-cos-2-$PREV_BUILD-hdp-v2.* + python cleanup.py cleanup .*$HOST-cos-2-$PREV_BUILD-hdp-v2.* elif [[ $PLUGIN =~ 'cdh' ]]; then IMAGE_TYPE=$(echo $PREV_JOB | awk -F '-' '{ print $5 }') if [ "$IMAGE_TYPE" == "centos" ]; then @@ -94,11 +94,11 @@ else then JOB_TYPE='[1-9]-transient' fi - if [ $ENGINE == 'heat' ] - then - python cleanup.py cleanup-heat .*$HOST-$HADOOP_VERSION-$PREV_BUILD-$JOB_TYPE.* - else +# if [ $ENGINE == 'heat' ] +# then +# python cleanup.py cleanup-heat .*$HOST-$HADOOP_VERSION-$PREV_BUILD-$JOB_TYPE.* +# else python cleanup.py cleanup .*$HOST-$HADOOP_VERSION-$PREV_BUILD-$JOB_TYPE.* - fi +# fi fi set +x