diff options
| author |   Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-05-10 12:37:05 -0700 |
|---|---|---|
| committer | Trevor Bramwell <tbramwell@linuxfoundation.org> | 2017-05-17 13:27:59 -0700 |
| commit | 04a5f0c39cbcfb7a4f47eccc6c9ecb297df346f1 (patch) | |
| tree | c982d9fa485fc653695363f141fd63e660991d91 | |
| parent | ec7db4e0c399ec6a01441139d6ef9caf93297917 (diff) | |
Remove old GS-Cleanup Job from Apex
This job template isn't attached to a job, so it doesn't even get
executed; Further, artifact cleanup is take care of by
'releng-artifact-cleanup-daily-{stream}'
Change-Id: I3e4d0339650f0507b8a3cd1512c2ca643f4fe75a
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
| -rwxr-xr-x | jjb/apex/apex-gs-cleanup.sh | 19 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 34 |
2 files changed, 0 insertions, 53 deletions
diff --git a/jjb/apex/apex-gs-cleanup.sh b/jjb/apex/apex-gs-cleanup.sh deleted file mode 100755 index 1629aa85e..000000000 --- a/jjb/apex/apex-gs-cleanup.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -# log info to console -echo "Cleaning Google Storage" -echo "-----------------------" -echo - -thirty_days_ago=$(date -d "30 days ago" +"%Y%m%d") - -for i in $(gsutil ls gs://$GS_URL/*201?*); do - filedate=$(date -d "$(echo $i | grep -Eo 201[0-9]-?[0-9][0-9]-?[0-9][0-9])" +"%Y%m%d") - if [ $filedate -lt $thirty_days_ago ]; then - # gsutil indicates what it is removing so no need for output here - gsutil rm $i - fi -done diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index d8b9eb147..a9646073e 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -1293,30 +1293,6 @@ abort-all-job: true git-revision: false -- job-template: - name: 'apex-gs-clean-{stream}' - - # Job template for clean - # - # Required Variables: - # stream: branch with - in place of / (eg. stable) - node: '{slave}' - - disabled: false - - parameters: - - project-parameter: - project: '{project}' - branch: '{branch}' - - apex-parameter: - gs-pathname: '{gs-pathname}' - - builders: - - 'apex-gs-clean' - - triggers: - - 'apex-gs-clean-{stream}' - ######################## # parameter macros ######################## @@ -1393,12 +1369,6 @@ !include-raw: ./apex-download-artifact.sh - builder: - name: 'apex-gs-cleanup' - builders: - - shell: - !include-raw: ./apex-gs-cleanup.sh - -- builder: name: 'apex-deploy' builders: - shell: @@ -1415,7 +1385,3 @@ name: 'apex-danube' triggers: - timed: '0 12 * * *' -- trigger: - name: 'apex-gs-clean-{stream}' - triggers: - - timed: '0 2 * * *'
\ No newline at end of file |