workload-automation: install devlib from git repository

Before installing Workload Automation install devlib using code from
repository. Devlib installed from pypi package might be outdated. This
method is also used by WA when creating docker container.

Change-Id: Ifd08b51fe999f833e9e7f849d15c46111d6b5030
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

4 files changed, 36 insertions, 6 deletions

diff --git a/automated/android/workload-automation/workload-automation.sh b/automated/android/workload-automation/workload-automation.sh
index 21c56dd..263b86f 100755
--- a/automated/android/workload-automation/workload-automation.sh
+++ b/automated/android/workload-automation/workload-automation.sh
@@ -15,13 +15,15 @@ CONFIG="config/generic-android.py"
 AGENDA="agenda/generic-linpack.yaml"
 BUILD_TOOLS_URL="http://testdata.validation.linaro.org/apks/workload-automation/build-tools.tar.gz"
 WA_HOME_URL="http://testdata.validation.linaro.org/apks/workload-automation/workload_automation_home.tar.gz"
+DEVLIB_REPO="https://github.com/ARM-software/devlib.git"
+DEVLIB_TAG="master"
 
 usage() {
-    echo "Usage: $0 [-s <true|false>] [-S <android_serial>] [-t <boot_timeout>] [-T <wa_tag>] [-r <wa_templates_repo>] [-g <templates_branch>] [-c <config>] [-a <agenda>] [-b <build_tools_url>] [-w <wa_home_url>] [-p <aep_path>] [-o <output_dir>] [-R <wa_git_repository>]" 1>&2
+    echo "Usage: $0 [-s <true|false>] [-S <android_serial>] [-t <boot_timeout>] [-T <wa_tag>] [-r <wa_templates_repo>] [-g <templates_branch>] [-c <config>] [-a <agenda>] [-b <build_tools_url>] [-w <wa_home_url>] [-p <aep_path>] [-o <output_dir>] [-R <wa_git_repository>] [-d <devlib_repo>] [-D <devlib_tag>]" 1>&2
     exit 1
 }
 
-while getopts ":s:S:t:T:r:g:c:a:b:w:p:o:R:" opt; do
+while getopts ":s:S:t:T:r:g:c:a:b:w:p:o:R:D:d:" opt; do
     case "${opt}" in
         s) SKIP_INSTALL="${OPTARG}" ;;
         S) ANDROID_SERIAL="${OPTARG}" ;;
@@ -36,6 +38,8 @@ while getopts ":s:S:t:T:r:g:c:a:b:w:p:o:R:" opt; do
         R) WA_GIT_REPO="${OPTARG}" ;;
         p) PROBE="${OPTARG}" ;;
         o) NEW_OUTPUT="${OPTARG}" ;;
+        D) DEVLIB_TAG="${OPTARG}" ;;
+        d) DEVLIB_REPO="${OPTARG}" ;;
         *) usage ;;
     esac
 done
@@ -64,6 +68,14 @@ else
     pip install --upgrade --quiet pip && hash -r
     pip install --upgrade --quiet setuptools
     pip install --quiet pexpect pyserial pyyaml docutils python-dateutil
+    info_msg "Installing devlib..."
+    rm -rf devlib
+    git clone "${DEVLIB_REPO}" devlib
+    (
+    cd devlib
+    git checkout "${DEVLIB_TAG}"
+    )
+    pip2 install --quiet ./devlib
     info_msg "Installing workload-automation..."
     rm -rf workload-automation
     git clone "${WA_GIT_REPO}" workload-automation
diff --git a/automated/android/workload-automation/workload-automation.yaml b/automated/android/workload-automation/workload-automation.yaml
index edf6a91..5a6cc7a 100644
--- a/automated/android/workload-automation/workload-automation.yaml
+++ b/automated/android/workload-automation/workload-automation.yaml
@@ -24,6 +24,9 @@ params:
     # Params for WA test run.
     WA_TAG: "master"
     WA_GIT_REPO: "https://github.com/ARM-software/workload-automation"
+    # Install devlib, which is WA depenency
+    DEVLIB_REPO: "https://github.com/ARM-software/devlib.git"
+    DEVLIB_TAG: "master"
     BUILD_TOOLS_URL: "http://testdata.validation.linaro.org/apks/workload-automation/build-tools.tar.gz"
     WA_HOME_URL: "http://testdata.validation.linaro.org/apks/workload-automation/workload_automation_home.tar.gz"
     WA_TEMPLATES_REPO: "https://git.linaro.org/qa/wa2-lava.git"
@@ -51,7 +54,7 @@ run:
         - if [ -z "${OUTPUT}" ]; then OUTPUT="./output"; fi
         - echo ${OUTPUT}
         # Test run.
-        - ./workload-automation.sh -s "${SKIP_INSTALL}" -t "${BOOT_TIMEOUT}" -S "${ANDROID_SERIAL}" -T "${WA_TAG}" -r "${WA_TEMPLATES_REPO}" -g "${TEMPLATES_BRANCH}" -c "${CONFIG}" -a "${AGENDA}" -b "${BUILD_TOOLS_URL}" -w "${WA_HOME_URL}" -p "${PROBE}" -R "${WA_GIT_REPO}" -o "${OUTPUT}"
+        - ./workload-automation.sh -s "${SKIP_INSTALL}" -t "${BOOT_TIMEOUT}" -S "${ANDROID_SERIAL}" -T "${WA_TAG}" -r "${WA_TEMPLATES_REPO}" -g "${TEMPLATES_BRANCH}" -c "${CONFIG}" -a "${AGENDA}" -b "${BUILD_TOOLS_URL}" -w "${WA_HOME_URL}" -p "${PROBE}" -R "${WA_GIT_REPO}" -d "${DEVLIB_REPO}" -D "${DEVLIB_TAG}" -o "${OUTPUT}"
         # Upload test output to artifactorial.
         - tar caf "wa-output.tar.xz" "${OUTPUT}"
         - ../../utils/upload-to-artifactorial.sh -a "wa-output.tar.xz" -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}"
diff --git a/automated/linux/workload-automation/workload-automation.sh b/automated/linux/workload-automation/workload-automation.sh
index 2662a5d..9de4e3d 100755
--- a/automated/linux/workload-automation/workload-automation.sh
+++ b/automated/linux/workload-automation/workload-automation.sh
@@ -11,13 +11,15 @@ WA_TEMPLATES_REPO="https://git.linaro.org/qa/wa2-lava.git"
 TEMPLATES_BRANCH="wa-templates"
 CONFIG="config/generic-linux-localhost.py"
 AGENDA="agenda/linux-dhrystone.yaml"
+DEVLIB_REPO="https://github.com/ARM-software/devlib.git"
+DEVLIB_TAG="master"
 
 usage() {
-    echo "Usage: $0 [-s <true|false>] [-t <wa_tag>] [-r <wa_templates_repo>] [-T <templates_branch>] [-c <config>] [-a <agenda>] [-o <output_dir> ] [-R <wa_git_repository>]" 1>&2
+    echo "Usage: $0 [-s <true|false>] [-t <wa_tag>] [-r <wa_templates_repo>] [-T <templates_branch>] [-c <config>] [-a <agenda>] [-o <output_dir> ] [-R <wa_git_repository>] [-d <devlib_repo>] [-D <devlib_tag>]" 1>&2
     exit 1
 }
 
-while getopts ":s:t:r:T:c:a:o:R:" opt; do
+while getopts ":s:t:r:T:c:a:o:R:D:d:" opt; do
     case "${opt}" in
         s) SKIP_INSTALL="${OPTARG}" ;;
         t) WA_TAG="${OPTARG}" ;;
@@ -27,6 +29,8 @@ while getopts ":s:t:r:T:c:a:o:R:" opt; do
         a) AGENDA="${OPTARG}" ;;
         R) WA_GIT_REPO="${OPTARG}" ;;
         o) NEW_OUTPUT="${OPTARG}" ;;
+        D) DEVLIB_TAG="${OPTARG}" ;;
+        d) DEVLIB_REPO="${OPTARG}" ;;
         *) usage ;;
     esac
 done
@@ -50,6 +54,14 @@ else
     pip install --upgrade --quiet pip && hash -r
     pip install --upgrade --quiet setuptools
     pip install --quiet pexpect pyserial pyyaml docutils python-dateutil
+    info_msg "Installing devlib..."
+    rm -rf devlib
+    git clone "${DEVLIB_REPO}" devlib
+    (
+    cd devlib
+    git checkout "${DEVLIB_TAG}"
+    )
+    pip2 install --quiet ./devlib
     info_msg "Installing workload-automation..."
     rm -rf workload-automation
     git clone "${WA_GIT_REPO}" workload-automation
diff --git a/automated/linux/workload-automation/workload-automation.yaml b/automated/linux/workload-automation/workload-automation.yaml
index 38895eb..38cc8a1 100644
--- a/automated/linux/workload-automation/workload-automation.yaml
+++ b/automated/linux/workload-automation/workload-automation.yaml
@@ -23,6 +23,9 @@ params:
     # Params for WA test run.
     WA_TAG: "master"
     WA_GIT_REPO: "https://github.com/ARM-software/workload-automation"
+    # Install devlib, which is WA depenency
+    DEVLIB_REPO: "https://github.com/ARM-software/devlib.git"
+    DEVLIB_TAG: "master"
     WA_TEMPLATES_REPO: "https://git.linaro.org/qa/wa2-lava.git"
     TEMPLATES_BRANCH: "wa-templates"
     CONFIG: "config/generic-linux-localhost.py"
@@ -47,7 +50,7 @@ run:
         - if [ -z "${OUTPUT}" ]; then OUTPUT="./output"; fi
         - echo ${OUTPUT}
         # Test run.
-        - ./workload-automation.sh -s "${SKIP_INSTALL}" -t "${WA_TAG}" -r "${WA_TEMPLATES_REPO}" -T "${TEMPLATES_BRANCH}" -c "${CONFIG}" -a "${AGENDA}" -R "${WA_GIT_REPO}" -o "${OUTPUT}"
+        - ./workload-automation.sh -s "${SKIP_INSTALL}" -t "${WA_TAG}" -r "${WA_TEMPLATES_REPO}" -T "${TEMPLATES_BRANCH}" -c "${CONFIG}" -a "${AGENDA}" -R "${WA_GIT_REPO}" -d "${DEVLIB_REPO}" -D "${DEVLIB_TAG}" -o "${OUTPUT}"
         # Upload test output to artifactorial.
         - tar caf "wa-output.tar.xz" "${OUTPUT}"
         - ../../utils/upload-to-artifactorial.sh -a "wa-output.tar.xz" -u "${ARTIFACTORIAL_URL}" -t "${ARTIFACTORIAL_TOKEN}"