aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMilosz Wasilewski <milosz.wasilewski@linaro.org>2016-07-12 12:39:07 +0100
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2016-07-12 13:27:09 +0100
commit1415f2b6831275f19dbecbba6493d3b5963208ac (patch)
treeed73a76ca28980585d15ec99343e41c8b58f737e
parent29132005059d288939da5a8967997debe2aed9e2 (diff)
downloadconfigs-1415f2b6831275f19dbecbba6493d3b5963208ac.tar.gz
android-chromium: Fixed LAVA template
Change-Id: If1797ada16e346854e5671375835f29bda28e602 Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
-rw-r--r--android-chromium-clang-armv7.yaml3
-rw-r--r--android-chromium-clang-armv8.yaml3
-rw-r--r--android-chromium-gcc-armv7.yaml3
-rw-r--r--android-chromium-gcc-armv8.yaml3
-rw-r--r--android-chromium/lava-job-definitions/hikey/template.json18
5 files changed, 14 insertions, 16 deletions
diff --git a/android-chromium-clang-armv7.yaml b/android-chromium-clang-armv7.yaml
index 29708a4d3..dec41e76b 100644
--- a/android-chromium-clang-armv7.yaml
+++ b/android-chromium-clang-armv7.yaml
@@ -44,8 +44,6 @@
rm -rf configs
git clone https://git.linaro.org/ci/job/configs.git
./configs/android-chromium/chromium-build.sh
- # Prepare LAVA JSON
- sed -i "s/\$APK_URL/https:\/\/snapshots.linaro.org\/android\/${JOB_NAME}\/${BUILD_NUMBER}\/ChromePublic.apk/g" ./configs/android-chromium/lava-job-definitions/hikey/template.json
# Publish
test -d ${HOME}/bin || mkdir ${HOME}/bin
@@ -75,6 +73,7 @@
BUILD_URL=${BUILD_URL}
LAVA_SERVER=validation.linaro.org/RPC2/
CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
+ DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
EOF
echo "Build finished"
diff --git a/android-chromium-clang-armv8.yaml b/android-chromium-clang-armv8.yaml
index 21522f4f0..04ffb79a6 100644
--- a/android-chromium-clang-armv8.yaml
+++ b/android-chromium-clang-armv8.yaml
@@ -44,8 +44,6 @@
rm -rf configs
git clone https://git.linaro.org/ci/job/configs.git
./configs/android-chromium/chromium-build.sh
- # Prepare LAVA JSON
- sed -i "s/\$APK_URL/https:\/\/snapshots.linaro.org\/android\/${JOB_NAME}\/${BUILD_NUMBER}\/ChromePublic.apk/g" ./configs/android-chromium/lava-job-definitions/hikey/template.json
# Publish
test -d ${HOME}/bin || mkdir ${HOME}/bin
@@ -75,6 +73,7 @@
BUILD_URL=${BUILD_URL}
LAVA_SERVER=validation.linaro.org/RPC2/
CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
+ DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
EOF
echo "Build finished"
diff --git a/android-chromium-gcc-armv7.yaml b/android-chromium-gcc-armv7.yaml
index 8caa66c1d..6dabeca69 100644
--- a/android-chromium-gcc-armv7.yaml
+++ b/android-chromium-gcc-armv7.yaml
@@ -44,8 +44,6 @@
rm -rf configs
git clone https://git.linaro.org/ci/job/configs.git
./configs/android-chromium/chromium-build.sh
- # Prepare LAVA JSON
- sed -i "s/\$APK_URL/https:\/\/snapshots.linaro.org\/android\/${JOB_NAME}\/${BUILD_NUMBER}\/ChromePublic.apk/g" ./configs/android-chromium/lava-job-definitions/hikey/template.json
# Publish
test -d ${HOME}/bin || mkdir ${HOME}/bin
@@ -75,6 +73,7 @@
BUILD_URL=${BUILD_URL}
LAVA_SERVER=validation.linaro.org/RPC2/
CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
+ DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
EOF
echo "Build finished"
diff --git a/android-chromium-gcc-armv8.yaml b/android-chromium-gcc-armv8.yaml
index f483dd88c..872e94558 100644
--- a/android-chromium-gcc-armv8.yaml
+++ b/android-chromium-gcc-armv8.yaml
@@ -44,8 +44,6 @@
rm -rf configs
git clone https://git.linaro.org/ci/job/configs.git
./configs/android-chromium/chromium-build.sh
- # Prepare LAVA JSON
- sed -i "s/\$APK_URL/https:\/\/snapshots.linaro.org\/android\/${JOB_NAME}\/${BUILD_NUMBER}\/ChromePublic.apk/g" ./configs/android-chromium/lava-job-definitions/hikey/template.json
# Publish
test -d ${HOME}/bin || mkdir ${HOME}/bin
@@ -75,6 +73,7 @@
BUILD_URL=${BUILD_URL}
LAVA_SERVER=validation.linaro.org/RPC2/
CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
+ DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
EOF
echo "Build finished"
diff --git a/android-chromium/lava-job-definitions/hikey/template.json b/android-chromium/lava-job-definitions/hikey/template.json
index 78000e2f1..e9e2eacd6 100644
--- a/android-chromium/lava-job-definitions/hikey/template.json
+++ b/android-chromium/lava-job-definitions/hikey/template.json
@@ -4,8 +4,9 @@
"command": "deploy_linaro_image",
"metadata": {
"chromium.lcr_base": "111",
- "chromium.build": "${BUILD_NUMBER}",
- "chromium.name": "${JOB_NAME}"
+ "chromium.build": "%%ANDROID_META_BUILD%%",
+ "chromium.name": "%%JOB_NAME%%",
+ "chromium.url": "%%ANDROID_META_URL%%"
},
"parameters": {
"image": "http://images.validation.linaro.org/ubuntu-14-04-server-base.img.gz",
@@ -16,8 +17,9 @@
"command": "deploy_linaro_android_image",
"metadata": {
"chromium.lcr_base": "111",
- "chromium.build": "${BUILD_NUMBER}",
- "chromium.name": "${JOB_NAME}"
+ "chromium.build": "%%ANDROID_META_BUILD%%",
+ "chromium.name": "%%JOB_NAME%%",
+ "chromium.url": "%%ANDROID_META_URL%%"
},
"parameters": {
"role": "target",
@@ -63,7 +65,7 @@
{
"git-repo": "git://git.linaro.org/qa/test-definitions.git",
"parameters": {
- "DOWNLOAD_URL": "$APK_URL",
+ "DOWNLOAD_URL": "%%DOWNLOAD_URL%%/ChromePublic.apk",
"TEST_NAME": "installchromium"
},
"testdef": "android/installapk.yaml"
@@ -121,7 +123,7 @@
{
"command": "submit_results_on_host",
"parameters": {
- "server": "http://${LAVA_SERVER}",
+ "server": "http://validation.linaro.org/RPC2/",
"stream": "/private/team/lmg/"
}
}
@@ -134,11 +136,11 @@
},
{
"count": 1,
- "device_type": "${DEVICE_TYPE}",
+ "device_type": "hi6220-hikey",
"role": "target"
}
],
- "job_name": "${BUILD_URL}",
+ "job_name": "%%ANDROID_META_URL%%",
"logging_level": "INFO",
"timeout": 9000
}