aboutsummaryrefslogtreecommitdiffstats
path: root/jjb/ci-apps-verify
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-09-27 21:26:16 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-09-27 21:26:39 +0200
commita4e35c6851e8cf5e6ae54d635b9f25adae249863 (patch)
treeb450351ba32e02a95a25832301cacf2e397b756b /jjb/ci-apps-verify
parent2859ba9f61f8a8f43bcfffb9662ca7fbc0322e4c (diff)
Per branch app build
Thie change introduces app builds per apps/* repo branch. E.g. master and dab branch are separately tracked and built. Preparation of the app folder. Change-Id: I5f15b68e072c6abc69dfd41197ad2052ed8aed4e Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb/ci-apps-verify')
-rw-r--r--jjb/ci-apps-verify/ci-apps-jjb.yaml76
1 files changed, 33 insertions, 43 deletions
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index c31eb765..fa412d17 100644
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -35,11 +35,11 @@
- settings-bluetooth
- settings-wifi
jobs:
- - ci-apps-{project}-verify
+ - ci-apps-{project}-verify-{aglbranch}
- ci-apps-{project}-verify-{aglbranch}-CIB-{architecture}
- - ci-apps-{project}-verify-CIB-finish-success
- - ci-apps-{project}-verify-failure
- - ci-apps-{project}-remove-artifacts
+ - ci-apps-{project}-verify-{aglbranch}-CIB-finish-success
+ - ci-apps-{project}-verify-{aglbranch}-failure
+ - ci-apps-{project}-remove-{aglbranch}-artifacts
# - ci-apps-{project}-verify-CIB-start
# - ci-apps-{project}-verify-CIBT-start
#- ci-apps-{project}-verify-CIBT-{architecture}
@@ -54,7 +54,7 @@
# ci-apps-{project}-verify = trigger from gerrit and control job
################################################################################
- job-template:
- name: 'ci-apps-{project}-verify'
+ name: 'ci-apps-{project}-verify-{aglbranch}'
project-type: multijob
concurrent: true
node: control-slave
@@ -65,11 +65,11 @@
description: "Project to build"
- string:
name: GERRIT_BRANCH
- default: master
+ default: '{aglbranch}'
description: "branch to build"
- string:
name: GERRIT_REFSPEC
- default: refs/heads/master
+ default: 'refs/heads/{aglbranch}'
description: "refspec to build"
- string:
name: GERRIT_CHANGE_NUMBER
@@ -81,7 +81,7 @@
description: "patchset # to build"
- string:
name: AGLBRANCH
- default: 'master'
+ default: '{aglbranch}'
description: "AGL release branch to use"
build-discarder:
days-to-keep: 30
@@ -90,7 +90,7 @@
triggers:
- gerrit-trigger-patch-submitted-manual-verified:
name: 'apps/{project}'
- branch: '**/**/**'
+ branch: 'refs/heads/{aglbranch}'
silent: 'true'
wrappers:
- agl-infra-wrappers:
@@ -113,40 +113,26 @@
name: CIB-{project}
condition: SUCCESSFUL
projects:
- - name: 'ci-apps-{project}-verify-master-CIB-arm'
+ - name: 'ci-apps-{project}-verify-{aglbranch}-CIB-arm'
current-parameters: true
#abort-all-job: true
kill-phase-on: FAILURE
- predefined-parameters: AGLBRANCH=master
- - name: 'ci-apps-{project}-verify-master-CIB-aarch64'
+ predefined-parameters: AGLBRANCH={aglbranch}
+ - name: 'ci-apps-{project}-verify-{aglbranch}-CIB-aarch64'
current-parameters: true
#abort-all-job: true
kill-phase-on: FAILURE
- predefined-parameters: AGLBRANCH=master
- - name: 'ci-apps-{project}-verify-master-CIB-x86-64'
+ predefined-parameters: AGLBRANCH={aglbranch}
+ - name: 'ci-apps-{project}-verify-{aglbranch}-CIB-x86-64'
current-parameters: true
#abort-all-job: true
kill-phase-on: FAILURE
- predefined-parameters: AGLBRANCH=master
- #- name: 'ci-apps-{project}-verify-dab-CIB-arm'
- # current-parameters: true
- # #abort-all-job: true
- # kill-phase-on: FAILURE
- # predefined-parameters: AGLBRANCH=dab
- #- name: 'ci-apps-{project}-verify-dab-CIB-aarch64' # does not exist in dab
- # current-parameters: true
- # #abort-all-job: true
- # kill-phase-on: FAILURE
- #- name: 'ci-apps-{project}-verify-dab-CIB-x86-64'
- # current-parameters: true
- # #abort-all-job: true
- # kill-phase-on: FAILURE
- # predefined-parameters: AGLBRANCH=dab
+ predefined-parameters: AGLBRANCH={aglbranch}
- multijob:
- name: CIB-{project}-finish-success
+ name: CIB-{project}-{aglbranch}-finish-success
condition: SUCCESSFUL
projects:
- - name: 'ci-apps-{project}-verify-CIB-finish-success'
+ - name: 'ci-apps-{project}-verify-{aglbranch}-CIB-finish-success'
current-parameters: true
abort-all-job: true
kill-phase-on: FAILURE
@@ -167,11 +153,11 @@
description: "Project to build"
- string:
name: GERRIT_BRANCH
- default: master
+ default: '{aglbranch}'
description: "branch to build"
- string:
name: GERRIT_REFSPEC
- default: refs/heads/master
+ default: refs/heads/{aglbranch}
description: "refspec to build"
- string:
name: GERRIT_CHANGE_NUMBER
@@ -224,7 +210,7 @@
# ci-apps-{project}-verify-CIB-finish-succcess = success, msg to gerrit
################################################################################
- job-template:
- name: 'ci-apps-{project}-verify-CIB-finish-success'
+ name: 'ci-apps-{project}-verify-{aglbranch}-CIB-finish-success'
project-type: freestyle
concurrent: true
node: control-slave
@@ -235,11 +221,11 @@
description: "Project to build"
- string:
name: GERRIT_BRANCH
- default: master
+ default: '{aglbranch}'
description: "branch to build"
- string:
name: GERRIT_REFSPEC
- default: refs/heads/master
+ default: 'refs/heads/{aglbranch}'
description: "refspec to build"
- string:
name: GERRIT_CHANGE_NUMBER
@@ -249,6 +235,10 @@
name: GERRIT_PATCHSET_NUMBER
default: "2"
description: "patchset # to build"
+ - string:
+ name: AGLBRANCH
+ default: '{aglbranch}'
+ description: "AGL release branch to use"
build-discarder:
days-to-keep: 30
artifact-days-to-keep: -1
@@ -267,7 +257,7 @@
# ci-apps-{project}-verify-failure = message back to gerrit on failure
################################################################################
- job-template:
- name: 'ci-apps-{project}-verify-failure'
+ name: 'ci-apps-{project}-verify-{aglbranch}-failure'
project-type: freestyle
concurrent: true
node: control-slave
@@ -278,11 +268,11 @@
description: "Project to build"
- string:
name: GERRIT_BRANCH
- default: master
+ default: '{aglbranch}'
description: "branch to build"
- string:
name: GERRIT_REFSPEC
- default: refs/heads/master
+ default: refs/heads/{aglbranch}
description: "refspec to build"
- string:
name: GERRIT_CHANGE_NUMBER
@@ -546,7 +536,7 @@
# -remove-artifacts = merge/abandon, remove artifacts and later trigger sstate
################################################################################
- job-template:
- name: 'ci-apps-{project}-remove-artifacts'
+ name: 'ci-apps-{project}-remove-{aglbranch}-artifacts'
project-type: freestyle
concurrent: true
node: control-slave
@@ -557,11 +547,11 @@
description: "Project to build"
- string:
name: GERRIT_BRANCH
- default: master
+ default: '{aglbranch}'
description: "branch to build"
- string:
name: GERRIT_REFSPEC
- default: refs/heads/master
+ default: refs/heads/{aglbranch}
description: "refspec to build"
- string:
name: GERRIT_CHANGE_NUMBER
@@ -583,7 +573,7 @@
triggers:
- gerrit-trigger-silent-patch-merged-abandoned:
name: 'apps/{project}'
- branch: '**/**/**'
+ branch: 'refs/heads/{aglbranch}'
builders:
- shell:
!include-raw-escape: