aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--android-lcr-member-juno-n-premerge-ci.yaml76
-rw-r--r--android-lcr-reference-hikey-master-premerge-ci.yaml (renamed from android-lcr-member-hikey-master-premerge-ci.yaml)12
-rw-r--r--android-lcr-reference-hikey-master.yaml (renamed from android-lcr-member-hikey-master.yaml)2
-rw-r--r--android-lcr-reference-hikey-o-premerge-ci.yaml (renamed from android-lcr-member-hikey-n-premerge-ci.yaml)18
-rw-r--r--android-lcr-reference-x15-o-premerge-ci.yaml (renamed from android-lcr-member-x15-n-premerge-ci.yaml)18
-rw-r--r--android-lcr/hikey/premerge-ci-builders.yaml.inc86
-rw-r--r--android-lcr/juno/premerge-ci-builders.yaml.inc29
-rw-r--r--android-lcr/x15/premerge-ci-builders.yaml.inc20
8 files changed, 25 insertions, 236 deletions
diff --git a/android-lcr-member-juno-n-premerge-ci.yaml b/android-lcr-member-juno-n-premerge-ci.yaml
deleted file mode 100644
index 66b4bf5cd..000000000
--- a/android-lcr-member-juno-n-premerge-ci.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- job:
- name: android-lcr-member-juno-n-premerge-ci
- project-type: freestyle
- defaults: global
- properties:
- - authorization:
- anonymous:
- - job-read
- - job-extended-read
- linaro:
- - job-build
- - job-cancel
- - build-discarder:
- days-to-keep: 60
- num-to-keep: 60
- parameters:
- - string:
- name: ART_URL
- default: https://android-qa-reports.linaro.org/api/
- - string:
- name: BUILD_DIR
- default: m-lcr-nougat
- - string:
- name: BUILD_CONFIG_FILENAME
- default: lcr-member-juno-n
- disabled: false
- node: docker-xenial-aosp
- display-name: 'Premerge CI job to test patch for juno M-LCR'
- concurrent: true
- triggers:
- - gerrit:
- override-votes: true
- gerrit-build-successful-verified-value: 1
- gerrit-build-failed-verified-value: -1
- server-name: __ANY__
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: '.*RunPremergeJunoTests.*'
- server-name: __ANY__
- projects:
- - project-compare-type: 'PLAIN'
- project-pattern: 'android/android-patchsets'
- branches:
- - branch-compare-type: 'PLAIN'
- branch-pattern: 'master'
- - project-compare-type: 'PLAIN'
- project-pattern: 'device/linaro/common'
- branches:
- - branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-nougat'
- - project-compare-type: 'PLAIN'
- project-pattern: 'android/device/linaro/juno'
- branches:
- - branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-nougat'
- - project-compare-type: 'PLAIN'
- project-pattern: 'linaro-art/platform/manifest'
- branches:
- - branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-nougat'
- - project-compare-type: 'PLAIN'
- project-pattern: 'android-build-configs'
- branches:
- - branch-compare-type: 'PLAIN'
- branch-pattern: 'master'
- wrappers:
- - timestamps
- - timeout:
- timeout: 500
- - ssh-agent-credentials:
- users:
- - '768c1ba1-6052-4b97-a531-7e4fabda6979'
- builders:
- !include: android-lcr/juno/premerge-ci-builders.yaml.inc
- publishers:
- !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-member-hikey-master-premerge-ci.yaml b/android-lcr-reference-hikey-master-premerge-ci.yaml
index 4be177e48..0c2b72183 100644
--- a/android-lcr-member-hikey-master-premerge-ci.yaml
+++ b/android-lcr-reference-hikey-master-premerge-ci.yaml
@@ -1,5 +1,5 @@
- job:
- name: android-lcr-member-hikey-master-premerge-ci
+ name: android-lcr-reference-hikey-master-premerge-ci
project-type: freestyle
defaults: global
properties:
@@ -22,7 +22,7 @@
default: aosp-master
- string:
name: BUILD_CONFIG_FILENAME
- default: lcr-member-hikey-master
+ default: lcr-reference-hikey-master
disabled: false
node: docker-xenial-aosp
display-name: 'Premerge CI job to test patch for HiKey AOSP Master build'
@@ -38,7 +38,7 @@
server-name: __ANY__
projects:
- project-compare-type: 'PLAIN'
- project-pattern: 'android/android-patchsets'
+ project-pattern: 'android-patchsets'
branches:
- branch-compare-type: 'PLAIN'
branch-pattern: 'master'
@@ -46,9 +46,9 @@
project-pattern: 'device/linaro/common'
branches:
- branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-o-preview'
+ branch-pattern: 'linaro-oreo'
- project-compare-type: 'PLAIN'
- project-pattern: 'linaro-art/platform/manifest'
+ project-pattern: 'platform/manifest'
branches:
- branch-compare-type: 'PLAIN'
branch-pattern: 'linaro-master'
@@ -65,6 +65,6 @@
users:
- '768c1ba1-6052-4b97-a531-7e4fabda6979'
builders:
- !include: android-lcr/hikey/premerge-ci-builders.yaml.inc
+ !include: android-lcr/hikey/builders-v2.yaml.inc
publishers:
!include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-member-hikey-master.yaml b/android-lcr-reference-hikey-master.yaml
index 0596b5b00..b594c9ca5 100644
--- a/android-lcr-member-hikey-master.yaml
+++ b/android-lcr-reference-hikey-master.yaml
@@ -1,5 +1,5 @@
- job:
- name: android-lcr-member-hikey-master
+ name: android-lcr-reference-hikey-master
project-type: freestyle
defaults: global
properties:
diff --git a/android-lcr-member-hikey-n-premerge-ci.yaml b/android-lcr-reference-hikey-o-premerge-ci.yaml
index 74532ae01..0f27ec927 100644
--- a/android-lcr-member-hikey-n-premerge-ci.yaml
+++ b/android-lcr-reference-hikey-o-premerge-ci.yaml
@@ -1,5 +1,5 @@
- job:
- name: android-lcr-member-hikey-n-premerge-ci
+ name: android-lcr-reference-hikey-o-premerge-ci
project-type: freestyle
defaults: global
properties:
@@ -19,13 +19,13 @@
default: https://android-qa-reports.linaro.org/api/
- string:
name: BUILD_DIR
- default: m-lcr-nougat
+ default: r-lcr-oreo
- string:
name: BUILD_CONFIG_FILENAME
- default: lcr-member-hikey-n
+ default: lcr-reference-hikey-o
disabled: false
node: docker-xenial-aosp
- display-name: 'Premerge CI job to test patch for hikey M-LCR'
+ display-name: 'Premerge CI job to test patch for hikey Oreo R-LCR'
concurrent: true
triggers:
- gerrit:
@@ -38,7 +38,7 @@
server-name: __ANY__
projects:
- project-compare-type: 'PLAIN'
- project-pattern: 'android/android-patchsets'
+ project-pattern: 'android-patchsets'
branches:
- branch-compare-type: 'PLAIN'
branch-pattern: 'master'
@@ -46,12 +46,12 @@
project-pattern: 'device/linaro/common'
branches:
- branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-nougat'
+ branch-pattern: 'linaro-oreo'
- project-compare-type: 'PLAIN'
- project-pattern: 'linaro-art/platform/manifest'
+ project-pattern: 'platform/manifest'
branches:
- branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-nougat'
+ branch-pattern: 'linaro-oreo'
- project-compare-type: 'PLAIN'
project-pattern: 'android-build-configs'
branches:
@@ -65,6 +65,6 @@
users:
- '768c1ba1-6052-4b97-a531-7e4fabda6979'
builders:
- !include: android-lcr/hikey/premerge-ci-builders.yaml.inc
+ !include: android-lcr/hikey/builders-v2.yaml.inc
publishers:
!include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-member-x15-n-premerge-ci.yaml b/android-lcr-reference-x15-o-premerge-ci.yaml
index 7f562faef..a44dd7bf8 100644
--- a/android-lcr-member-x15-n-premerge-ci.yaml
+++ b/android-lcr-reference-x15-o-premerge-ci.yaml
@@ -1,5 +1,5 @@
- job:
- name: android-lcr-member-x15-n-premerge-ci
+ name: android-lcr-reference-x15-o-premerge-ci
project-type: freestyle
defaults: global
properties:
@@ -19,13 +19,13 @@
default: https://android-qa-reports.linaro.org/api/
- string:
name: BUILD_DIR
- default: m-lcr-nougat
+ default: r-lcr-oreo
- string:
name: BUILD_CONFIG_FILENAME
- default: lcr-member-x15-n
+ default: lcr-reference-x15-o
disabled: false
node: docker-xenial-aosp
- display-name: 'Premerge CI job to test patch for X15 M-LCR'
+ display-name: 'Premerge CI job to test patch for X15 R-LCR'
concurrent: true
triggers:
- gerrit:
@@ -38,7 +38,7 @@
server-name: __ANY__
projects:
- project-compare-type: 'PLAIN'
- project-pattern: 'android/android-patchsets'
+ project-pattern: 'android-patchsets'
branches:
- branch-compare-type: 'PLAIN'
branch-pattern: 'master'
@@ -46,12 +46,12 @@
project-pattern: 'device/linaro/common'
branches:
- branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-nougat'
+ branch-pattern: 'linaro-oreo'
- project-compare-type: 'PLAIN'
- project-pattern: 'linaro-art/platform/manifest'
+ project-pattern: 'platform/manifest'
branches:
- branch-compare-type: 'PLAIN'
- branch-pattern: 'linaro-nougat'
+ branch-pattern: 'linaro-oreo'
- project-compare-type: 'PLAIN'
project-pattern: 'android-build-configs'
branches:
@@ -65,6 +65,6 @@
users:
- '768c1ba1-6052-4b97-a531-7e4fabda6979'
builders:
- !include: android-lcr/x15/premerge-ci-builders.yaml.inc
+ !include: android-lcr/x15/builders.yaml.inc
publishers:
!include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr/hikey/premerge-ci-builders.yaml.inc b/android-lcr/hikey/premerge-ci-builders.yaml.inc
deleted file mode 100644
index bbaf59e80..000000000
--- a/android-lcr/hikey/premerge-ci-builders.yaml.inc
+++ /dev/null
@@ -1,86 +0,0 @@
- - shell:
- !include-raw:
- - android-lcr/common/builders.sh
- - android-lcr/hikey/builders.sh
- - inject:
- properties-file: publish_parameters
- - linaro-publish-token
- - shell:
- !include-raw:
- - android/linaro-publisher.sh
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-boottime.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-benchmarkpi.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cf-bench.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-javawhetstone.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-linpack.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-quadrantpro.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-scimark.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-rl-sqlite.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-vellamo3.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-applications.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-caffeinemark.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-antutu6.0.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
diff --git a/android-lcr/juno/premerge-ci-builders.yaml.inc b/android-lcr/juno/premerge-ci-builders.yaml.inc
deleted file mode 100644
index bd9f9266d..000000000
--- a/android-lcr/juno/premerge-ci-builders.yaml.inc
+++ /dev/null
@@ -1,29 +0,0 @@
- - shell: |
- CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
- CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
- CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
- echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
- - inject:
- properties-file: env_var_parameters
- - shell:
- !include-raw:
- - android-lcr/common/builders.sh
- - android-lcr/juno/builders.sh
- - inject:
- properties-file: publish_parameters
- - linaro-publish-token
- - shell:
- !include-raw:
- - android/linaro-publisher.sh
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-boottime.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- echo "Build finished"
diff --git a/android-lcr/x15/premerge-ci-builders.yaml.inc b/android-lcr/x15/premerge-ci-builders.yaml.inc
deleted file mode 100644
index 646f9db54..000000000
--- a/android-lcr/x15/premerge-ci-builders.yaml.inc
+++ /dev/null
@@ -1,20 +0,0 @@
- - shell:
- !include-raw:
- - android-lcr/common/builders.sh
- - android-lcr/x15/builders.sh
- - inject:
- properties-file: publish_parameters
- - linaro-publish-token
- - shell:
- !include-raw:
- - android/linaro-publisher.sh
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true
- - shell: |
- sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-boottime.json#g" ${WORKSPACE}/post_build_lava_parameters
- - trigger-builds:
- - project: 'post-build-lava'
- property-file: post_build_lava_parameters
- block: true