From fd4313e0c4b5d71a633e7ccb4d1640a6ef9bdfc1 Mon Sep 17 00:00:00 2001 From: Lisa Nguyen Date: Tue, 24 Jul 2018 22:18:49 -0700 Subject: workload-automation3: Update default paths and config filenames Fix remaining outdated paths and config filenames to run WA3. Otherwise, we will end up running WA2 if we don't cd into the correct directory and WA3 does not use config files with the .py extension. Change-Id: I4b081cbc7e2adf991b4272ada48018217724560b Signed-off-by: Lisa Nguyen --- automated/android/workload-automation3/aep-install.yaml | 2 +- automated/android/workload-automation3/workload-automation.yaml | 4 ++-- automated/linux/workload-automation3/workload-automation.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/automated/android/workload-automation3/aep-install.yaml b/automated/android/workload-automation3/aep-install.yaml index a8ed990..5099b7d 100644 --- a/automated/android/workload-automation3/aep-install.yaml +++ b/automated/android/workload-automation3/aep-install.yaml @@ -24,7 +24,7 @@ params: run: steps: - - cd ./automated/android/workload-automation + - cd ./automated/android/workload-automation3 - ./aep-install.sh -r "${AEP_REPOSITORY}" -t "${AEP_REF}" - ./aep-energy-config.sh -r "${AEP_CONFIG_REPOSITORY}" -t "${AEP_CONFIG_REF}" -p "${AEP_CONFIG_TARGET_PATH}" - ../../utils/send-to-lava.sh ./output/result.txt diff --git a/automated/android/workload-automation3/workload-automation.yaml b/automated/android/workload-automation3/workload-automation.yaml index 0f99803..9bbde23 100644 --- a/automated/android/workload-automation3/workload-automation.yaml +++ b/automated/android/workload-automation3/workload-automation.yaml @@ -31,7 +31,7 @@ params: WA_HOME_URL: "http://testdata.validation.linaro.org/apks/workload-automation/workload_automation_home.tar.gz" WA_TEMPLATES_REPO: "https://git.linaro.org/qa/wa-templates" TEMPLATES_BRANCH: "master" - CONFIG: "config/generic-android.py" + CONFIG: "config/generic-android.yaml" AGENDA: "agenda/android-dhrystone.yaml" # allow extra extenstions for WA WA_EXTENSION_PATHS: "" @@ -50,7 +50,7 @@ run: steps: - export WA_EXTENSION_PATHS=$WA_EXTENSION_PATHS - export WA_PLUGIN_PATHS=$WA_EXTENSION_PATHS - - cd ./automated/android/workload-automation + - cd ./automated/android/workload-automation3 - echo ${OUTPUT} - if [ -z "${OUTPUT}" ]; then OUTPUT="./output"; fi - echo ${OUTPUT} diff --git a/automated/linux/workload-automation3/workload-automation.yaml b/automated/linux/workload-automation3/workload-automation.yaml index 81addfd..a82a378 100644 --- a/automated/linux/workload-automation3/workload-automation.yaml +++ b/automated/linux/workload-automation3/workload-automation.yaml @@ -28,7 +28,7 @@ params: DEVLIB_TAG: "master" WA_TEMPLATES_REPO: "https://git.linaro.org/qa/wa-templates" TEMPLATES_BRANCH: "master" - CONFIG: "config/generic-linux-localhost.py" + CONFIG: "config/generic-linux-localhost.yaml" AGENDA: "agenda/linux-dhrystone.yaml" # allow extra extenstions for WA WA_EXTENSION_PATHS: "" @@ -45,7 +45,7 @@ params: run: steps: - export WA_EXTENSION_PATHS=$WA_EXTENSION_PATHS - - cd ./automated/linux/workload-automation + - cd ./automated/linux/workload-automation3 - echo ${OUTPUT} - if [ -z "${OUTPUT}" ]; then OUTPUT="./output"; fi - echo ${OUTPUT} -- cgit v1.2.3