diff --git a/.github/workflows/integ-test.yml b/.github/workflows/integ-test.yml index 8f696493..8ee787a3 100644 --- a/.github/workflows/integ-test.yml +++ b/.github/workflows/integ-test.yml @@ -357,9 +357,7 @@ jobs: - run: ansible-playbook tests/integration/cleanup/ci_replica_cleanup.yml smb_cleanup: - needs: - - integ - - integ-seq + needs: [] runs-on: [self-hosted2] container: quay.io/justinc1_github/scale_ci_integ:8 defaults: diff --git a/tests/integration/cleanup/smb_cleanup.sh b/tests/integration/cleanup/smb_cleanup.sh index ac47e110..eb97136f 100755 --- a/tests/integration/cleanup/smb_cleanup.sh +++ b/tests/integration/cleanup/smb_cleanup.sh @@ -21,7 +21,7 @@ delete_files () { files="$(echo "$list_dir" | head --lines=-2 | tail --lines=+3)" echo "files=$files" - today_date=$(date +'%b:%-d:%Y') + today_date=$(date +'%b:%Y') echo "Todays date: $today_date" while IFS= read -r line @@ -33,7 +33,8 @@ delete_files () { continue fi filename="$(echo "$line" | awk '{print $1}')" - file_date=$(echo "$line" | awk '{print $5":"$6":"$8}') + # file_date=$(echo "$line" | awk '{print $5":"$6":"$8}') # "Apr:27:2020" + file_date=$(echo "$line" | awk '{print $5":"$8}') # "Apr:2020" if [ "$file_date" == "$today_date" ] then echo "Keeping file $filename, timestamp is $file_date"