do not merge next and use host python for releng-scripts

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I299ffae4b0929c149db73af8ff05ab86ce0859b1

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 94ee03c..375dc55 100644 (file)
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -37,7 +37,7 @@
       - ci-platform-{project}-verify-CIBT-{testmachine}
       - ci-platform-{project}-verify-CIBT-complete
       - ci-platform-{project}-verify-CIBT-finish-success
-      - ci-platform-{project}-merge-update-next
+      #- ci-platform-{project}-merge-update-next
       - ci-platform-{project}-remove-artifacts
     description: "Managed by JJB. Do not Edit. \
                   <br>Build time graph:<br><img src='buildTimeGraph/png' />"

diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index b57cdcd..9bc736d 100644 (file)
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -16,7 +16,7 @@ else
 fi
 
 if [ -e releng-scripts/utils ]; then
-    export PATH=$PATH:$PWD/releng-scripts/utils
+    export PATH="/usr/bin:$PATH:$PWD/releng-scripts/utils"
     RELENG=$PWD/releng-scripts
 fi