Merge "Adding GS clenaup for Apex"

diff --combined jjb/apex/apex.yml
index 26090a3,91f76b5..6dbea1a
--- 1/jjb/apex/apex.yml
--- 2/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@@ -628,6 -628,30 +628,30 @@@
                  failure-threshold: 'never'
                  unstable-threshold: 'FAILURE'
  
+ - 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}'
+         - apex-parameter:
+             gs-pathname: '{gs-pathname}'
+ 
+     builders:
+         - 'apex-gs-clean'
+ 
+     triggers:
+         - 'apex-gs-clean-{stream}'
+ 
+ 
  ########################
  # parameter macros
  ########################
@@@ -736,7 -760,7 +760,7 @@@
              set -o pipefail
  
              # delete everything that is in $WORKSPACE
 -            /bin/rm -rf $WORKSPACE
 +            sudo /bin/rm -rf $WORKSPACE
  
  - builder:
      name: 'apex-upload-artifact'
@@@ -779,6 -803,30 +803,30 @@@
              echo "ISO Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
              echo "RPM Artifact is available as http://$GS_URL/$(basename $OPNFV_RPM_URL)"
  
+ - builder:
+     name: 'apex-gs-cleanup'
+     builders:
+         - shell: |
+             #!/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
+ 
  - builder:
      name: 'apex-deploy-virtual'
      builders:
@@@ -847,26 -895,6 +895,26 @@@
                  DEPLOY_CMD="./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
                  DEPLOY_FILE="${WORKSPACE}/config/deploy/${DEPLOY_SCENARIO}.yaml"
                  NETWORK_FILE="${WORKSPACE}/config/network/network_settings.yaml"
 +                # Make sure python34 is installed
 +                if ! rpm -q python34 > /dev/null; then
 +                    sudo yum install -y epel-release
 +                    if ! sudo yum install -y python34; then
 +                        echo "Failed to install python34"
 +                        exit 1
 +                    fi
 +                fi
 +                if ! rpm -q python34-PyYAML > /dev/null; then
 +                    sudo yum install -y epel-release
 +                    if ! sudo yum install -y python34-PyYAML; then
 +                        echo "Failed to install python34-PyYAML"
 +                        exit 1
 +                    fi
 +                fi
 +                if [ -z ${PYTHONPATH:-} ]; then
 +                    export PYTHONPATH=${WORKSPACE}/lib/python
 +                else
 +                    export PYTHONPATH=$PYTHONPATH:${WORKSPACE}/lib/python
 +                fi
              else
                  RPM_LIST=$RPM_INSTALL_PATH
                  for pkg in common undercloud opendaylight-sfc; do
@@@ -1010,3 -1038,7 +1058,7 @@@
      name: 'apex-brahmaputra'
      triggers:
          - timed: '0 3 * * *'
+ - trigger:
+     name: 'apex-gs-clean-{stream}'
+     triggers:
+         - timed: '0 2 * * *'