diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2017-11-02 19:35:37 +0000 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2017-11-02 19:35:37 +0000 |
| commit | 3d9438bfa2f06b89c1894ec32e1fe089066027a6 (patch) | |
| tree | fbc8ec4c42fbf3ee595003f0402243bceb9f5349 | |
| parent | 4f6be21b68cf024e07585658d91a47a66ca7c3f5 (diff) | |
automated: workload-automation: allow extra WA modules
Add support for WA_EXTENSION_PATHS variable to allow extra modules. The
modules have to be available in the system before workload-automation.sh
is executed.
Change-Id: I045e5c5095a582000676214ad838e917d79dece4
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
4 files changed, 9 insertions, 0 deletions
diff --git a/automated/android/workload-automation/workload-automation.sh b/automated/android/workload-automation/workload-automation.sh index 955ce5e..33d6cc1 100755 --- a/automated/android/workload-automation/workload-automation.sh +++ b/automated/android/workload-automation/workload-automation.sh @@ -80,6 +80,8 @@ else test -f workload_automation_home.tar.gz || wget -S --progress=dot:giga "${WA_HOME_URL}" tar -xf workload_automation_home.tar.gz ) + wa --version + wa list instruments fi initialize_adb diff --git a/automated/android/workload-automation/workload-automation.yaml b/automated/android/workload-automation/workload-automation.yaml index ccecb07..966fb34 100644 --- a/automated/android/workload-automation/workload-automation.yaml +++ b/automated/android/workload-automation/workload-automation.yaml @@ -29,6 +29,8 @@ params: TEMPLATES_BRANCH: "wa-templates" CONFIG: "config/generic-android.py" AGENDA: "agenda/android-linpack.yaml" + # allow extra extenstions for WA + WA_EXTENSION_PATHS: "" # Specify url and token for publishing artifacts. # For safety reasons, please set 'ARTIFACTORIAL_TOKEN' variable in job definition with # 'secrets' dictionary, and set job visibility to personal or group. @@ -38,6 +40,7 @@ params: run: steps: + - export WA_EXTENSION_PATHS=$WA_EXTENSION_PATHS - cd ./automated/android/workload-automation # 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}" diff --git a/automated/linux/workload-automation/workload-automation.sh b/automated/linux/workload-automation/workload-automation.sh index a0a1d35..441eb67 100755 --- a/automated/linux/workload-automation/workload-automation.sh +++ b/automated/linux/workload-automation/workload-automation.sh @@ -56,6 +56,7 @@ else which wa mkdir -p ~/.workload_automation wa --version + wa list instruments fi rm -rf wa-templates diff --git a/automated/linux/workload-automation/workload-automation.yaml b/automated/linux/workload-automation/workload-automation.yaml index 4aa1da3..5c7a3bb 100644 --- a/automated/linux/workload-automation/workload-automation.yaml +++ b/automated/linux/workload-automation/workload-automation.yaml @@ -26,6 +26,8 @@ params: TEMPLATES_BRANCH: "wa-templates" CONFIG: "config/generic-linux-localhost.py" AGENDA: "agenda/linux-dhrystone.yaml" + # allow extra extenstions for WA + WA_EXTENSION_PATHS: "" # Specify url and token for publishing artifacts. # For safety reasons, please set 'ARTIFACTORIAL_TOKEN' variable in job definition with # 'secrets' dictionary, and set job visibility to personal or group. @@ -35,6 +37,7 @@ params: run: steps: + - export WA_EXTENSION_PATHS=$WA_EXTENSION_PATHS - cd ./automated/linux/workload-automation # Test run. - ./workload-automation.sh -s "${SKIP_INSTALL}" -t "${WA_TAG}" -r "${WA_TEMPLATES_REPO}" -T "${TEMPLATES_BRANCH}" -c "${CONFIG}" -a "${AGENDA}" |