diff options
| -rw-r--r-- | android-lcr-member-hikey-m-clang.yaml | 2 | ||||
| -rw-r--r-- | android-lcr-member-hikey-m-low-mem.yaml | 2 | ||||
| -rw-r--r-- | android-lcr-member-hikey-m.yaml | 2 | ||||
| -rw-r--r-- | android-lcr-member-hikey-n.yaml | 2 | ||||
| -rw-r--r-- | android-lcr-member-juno-m.yaml | 2 | ||||
| -rw-r--r-- | android-lcr-member-juno-n.yaml | 2 | ||||
| -rw-r--r-- | android-lcr-reference-juno-m-member-build.yaml | 2 | ||||
| -rw-r--r-- | android-lcr-reference-juno-m.yaml | 2 | ||||
| -rwxr-xr-x | android-lcr/common/builders.sh | 4 |
9 files changed, 10 insertions, 10 deletions
diff --git a/android-lcr-member-hikey-m-clang.yaml b/android-lcr-member-hikey-m-clang.yaml index a8e7c93ffd..1724a172bb 100644 --- a/android-lcr-member-hikey-m-clang.yaml +++ b/android-lcr-member-hikey-m-clang.yaml @@ -22,7 +22,7 @@ num-to-keep: 60 disabled: false node: docker-utopic-aosp - display-name: 'Hikey - Member LCR Android M build with clang toolchain' + display-name: 'Hikey - Member LCR Android M Build with clang toolchain' concurrent: true triggers: - timed: 'H H * * 6' diff --git a/android-lcr-member-hikey-m-low-mem.yaml b/android-lcr-member-hikey-m-low-mem.yaml index 44fafdd5a7..4636942d3d 100644 --- a/android-lcr-member-hikey-m-low-mem.yaml +++ b/android-lcr-member-hikey-m-low-mem.yaml @@ -26,7 +26,7 @@ default: https://android-qa-reports.linaro.org/api/ disabled: false node: docker-utopic-aosp - display-name: 'Hikey - Member LCR Android M build with Low Memory configuration' + display-name: 'Hikey - Member LCR Android M Build with Low Memory configuration' concurrent: true triggers: - timed: 'H H * * 6' diff --git a/android-lcr-member-hikey-m.yaml b/android-lcr-member-hikey-m.yaml index f7f157d564..b3f3753fc2 100644 --- a/android-lcr-member-hikey-m.yaml +++ b/android-lcr-member-hikey-m.yaml @@ -26,7 +26,7 @@ default: https://android-qa-reports.linaro.org/api/ disabled: false node: docker-utopic-aosp - display-name: 'Hikey - Member LCR Android M build' + display-name: 'Hikey - Member LCR Android M Build' concurrent: true triggers: - timed: 'H H * * 6' diff --git a/android-lcr-member-hikey-n.yaml b/android-lcr-member-hikey-n.yaml index 80b2af4b4f..834898d9e7 100644 --- a/android-lcr-member-hikey-n.yaml +++ b/android-lcr-member-hikey-n.yaml @@ -26,7 +26,7 @@ default: https://android-qa-reports.linaro.org/api/ disabled: false node: docker-utopic-aosp - display-name: 'Hikey - Member LCR Android N build' + display-name: 'Hikey - Member LCR Android N Build' concurrent: true triggers: - timed: 'H H * * 6' diff --git a/android-lcr-member-juno-m.yaml b/android-lcr-member-juno-m.yaml index 278aaffed3..3eeef6991d 100644 --- a/android-lcr-member-juno-m.yaml +++ b/android-lcr-member-juno-m.yaml @@ -46,7 +46,7 @@ default: https://android-qa-reports.linaro.org/api/ disabled: false node: docker-utopic-aosp - display-name: 'Juno - Member LCR Android M Build' + display-name: 'Juno - Member LCR Android M build' concurrent: true scm: - kernel diff --git a/android-lcr-member-juno-n.yaml b/android-lcr-member-juno-n.yaml index 700e6012cf..af209d7d94 100644 --- a/android-lcr-member-juno-n.yaml +++ b/android-lcr-member-juno-n.yaml @@ -46,7 +46,7 @@ default: https://android-qa-reports.linaro.org/api/ disabled: false node: docker-utopic-aosp - display-name: 'Juno - Member LCR Android N Build' + display-name: 'Juno - Member LCR Android N build' concurrent: true scm: - kernel diff --git a/android-lcr-reference-juno-m-member-build.yaml b/android-lcr-reference-juno-m-member-build.yaml index 370bae79bb..50fb850933 100644 --- a/android-lcr-reference-juno-m-member-build.yaml +++ b/android-lcr-reference-juno-m-member-build.yaml @@ -38,7 +38,7 @@ default: https://android-qa-reports.linaro.org/api/ disabled: false node: docker-utopic-aosp - display-name: 'Juno - Reference LCR Android based ARM Member Build' + display-name: 'Juno - Reference LCR Android based ARM Member build' concurrent: true scm: - kernel diff --git a/android-lcr-reference-juno-m.yaml b/android-lcr-reference-juno-m.yaml index 45a58958cf..bb2cf4e65f 100644 --- a/android-lcr-reference-juno-m.yaml +++ b/android-lcr-reference-juno-m.yaml @@ -38,7 +38,7 @@ default: https://android-qa-reports.linaro.org/api/ disabled: false node: docker-utopic-aosp - display-name: 'Juno - Reference LCR Android M Build' + display-name: 'Juno - Reference LCR Android M build' concurrent: true scm: - kernel diff --git a/android-lcr/common/builders.sh b/android-lcr/common/builders.sh index 1677344a12..e0e193f64e 100755 --- a/android-lcr/common/builders.sh +++ b/android-lcr/common/builders.sh @@ -29,12 +29,12 @@ git config --global user.email "ci_notify@linaro.org" git config --global user.name "Linaro CI" java -version -BUILD_DIR=${BUILD_DIR:${JOB_NAME}} +BUILD_DIR=${BUILD_DIR:-${JOB_NAME}} if [ ! -d "/home/buildslave/srv/${BUILD_DIR}" ]; then sudo mkdir -p /home/buildslave/srv/${BUILD_DIR} sudo chmod 777 /home/buildslave/srv/${BUILD_DIR} fi -cd /home/buildslave/srv/${JOB_NAME} +cd /home/buildslave/srv/${BUILD_DIR} if [[ -n $PRIVATE_KEY ]]; then # Handle private key |