diff options
author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2018-05-08 11:21:12 +0100 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2018-05-08 11:21:12 +0100 |
commit | acbcd28e8e6faab5ad4c9e0682bb80b05b06ee9b (patch) | |
tree | f042066d7e2124673411fa296e7eb29c3711856f | |
parent | 07876d1db08163150d57815fce82f92499c2a7de (diff) |
workload-automation: fix AEP configuration regex
WA v2 and WA v3 use different variable names for installing
plugins/extensions. This enables using both v2 and v3 syntaxes for AEP.
Change-Id: I6e2408918baa1a773c71df9984b57c4e43ced63f
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
-rwxr-xr-x | automated/android/workload-automation/workload-automation.sh | 6 | ||||
-rw-r--r-- | automated/android/workload-automation/workload-automation.yaml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/automated/android/workload-automation/workload-automation.sh b/automated/android/workload-automation/workload-automation.sh index ae6ea74..eac7ad0 100755 --- a/automated/android/workload-automation/workload-automation.sh +++ b/automated/android/workload-automation/workload-automation.sh @@ -139,10 +139,12 @@ if [ -n "${PROBE}" ]; then CONFIG_FILE=$(basename "$(grep -rl "${PROBE}" .)") cd - # update AEP config path on agenda - sed -i "s|\$WA_EXTENSION_PATHS/*.*|\$WA_EXTENSION_PATHS/${CONFIG_FILE}\"|" agenda.yaml + sed -i "s|\$WA_EXTENSION_PATHS/*.*|${WA_EXTENSION_PATHS}/${CONFIG_FILE}\"|" agenda.yaml + sed -i "s|\$WA_PLUGIN_PATHS/*.*|${WA_EXTENSION_PATHS}/${CONFIG_FILE}\"|" agenda.yaml # update AEP config path on config.yaml if [ -f /root/.workload_automation/config.yaml ]; then - sed -i "s|\$WA_EXTENSION_PATHS/*.*|\$WA_EXTENSION_PATHS/${CONFIG_FILE}\"|" /root/.workload_automation/config.yaml + sed -i "s|\$WA_EXTENSION_PATHS/*.*|${WA_EXTENSION_PATHS}/${CONFIG_FILE}\"|" /root/.workload_automation/config.yaml + sed -i "s|\$WA_PLUGIN_PATHS/*.*|${WA_EXTENSION_PATHS}/${CONFIG_FILE}\"|" /root/.workload_automation/config.yaml fi ) fi diff --git a/automated/android/workload-automation/workload-automation.yaml b/automated/android/workload-automation/workload-automation.yaml index 5a6cc7a..f706299 100644 --- a/automated/android/workload-automation/workload-automation.yaml +++ b/automated/android/workload-automation/workload-automation.yaml @@ -49,6 +49,7 @@ params: run: steps: - export WA_EXTENSION_PATHS=$WA_EXTENSION_PATHS + - export WA_PLUGIN_PATHS=$WA_EXTENSION_PATHS - cd ./automated/android/workload-automation - echo ${OUTPUT} - if [ -z "${OUTPUT}" ]; then OUTPUT="./output"; fi |