From a6dc862082e0ff296517e40ee904d98c2e96b239 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Thu, 10 Aug 2017 16:47:16 +0200 Subject: Update ci loop for apps to include master and dab release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7434475bc75cd27c75b63e0a8e28e3525e12c684 Signed-off-by: Jan-Simon Möller --- jjb/ci-apps-verify/ci-apps-jjb.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'jjb/ci-apps-verify') diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 1a9fe290..a8c68dd8 100644 --- a/jjb/ci-apps-verify/ci-apps-jjb.yaml +++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml @@ -1,6 +1,9 @@ --- - project: name: ci-apps-AGL + aglbranch: + - master + - dab architecture: - aarch64 - x86-64 @@ -29,7 +32,7 @@ - settings-wifi jobs: - ci-apps-{project}-verify - - ci-apps-{project}-verify-CIB-{architecture} + - ci-apps-{project}-verify-{aglbranch}-CIB-{architecture} - ci-apps-{project}-verify-CIB-finish-success - ci-apps-{project}-verify-failure - ci-apps-{project}-remove-artifacts @@ -128,7 +131,7 @@ # ci-apps-{project}-verify-CIB-{architecture} = build job per arch ################################################################################ - job-template: - name: 'ci-apps-{project}-verify-CIB-{architecture}' + name: 'ci-apps-{project}-verify-{aglbranch}-CIB-{architecture}' project-type: freestyle concurrent: true node: agl-test-slave @@ -157,6 +160,10 @@ name: TARGETARCH default: '{architecture}' description: "Machine to build" + - string: + name: AGLBRANCH + default: '{aglbranch}' + description: "AGL release branch to use" build-discarder: days-to-keep: 30 @@ -171,7 +178,7 @@ builders: - shell: - # including from ../common into ci-apps-{project}-verify-CIB-{architecture} + # including from ../common into ci-apps-{project}-verify-{aglbranch}-CIB-{architecture} !include-raw-escape: - ../common/include-apps-header.sh - ../common/include-apps-fetch-install-sdk.sh -- cgit 1.2.3-korg