Merge "Adding GS clenaup for Apex"

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 91f76b5..6dbea1a 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -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'
@@ -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