diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2016-08-18 11:46:25 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2016-08-18 13:40:57 +0000 |
| commit | cb019d4eb3376fa073303913c610ad6f952b78f8 (patch) | |
| tree | e2bdc06e455f67fc825b78858f47f255b077bbb2 | |
| parent | 22e53fb00dc3672d8b7e5ae85409b73aab83522a (diff) | |
odp-publish: build on commit from ODP
Build on commit from master, api-next and next and not daily.
Change-Id: I038f2f84cd17cb0238e9fd0d7eee2e0ef8042eef
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
| -rw-r--r-- | odp-publish.yaml | 12 | ||||
| -rw-r--r-- | trigger-build-odp-api-next.yaml | 2 | ||||
| -rw-r--r-- | trigger-build-odp-next.yaml | 2 | ||||
| -rw-r--r-- | trigger-build-odp.yaml | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/odp-publish.yaml b/odp-publish.yaml index ad12e1686e..fe26fc2307 100644 --- a/odp-publish.yaml +++ b/odp-publish.yaml @@ -22,12 +22,13 @@ - string: name: platform_type default: 'generic' + - string: + name: GIT_BRANCH + default: 'master' disabled: false node: master child-workspace: . display-name: 'ODP publish' - triggers: - - timed: '@daily' axes: - axis: type: user-defined @@ -38,13 +39,6 @@ - usr_html - scan_build - axis: - type: user-defined - name: GIT_BRANCH - values: - - master - - next - - api-next - - axis: type: slave name: label values: diff --git a/trigger-build-odp-api-next.yaml b/trigger-build-odp-api-next.yaml index 721dfcbb9b..c93fe537e9 100644 --- a/trigger-build-odp-api-next.yaml +++ b/trigger-build-odp-api-next.yaml @@ -35,6 +35,6 @@ name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}' publishers: - trigger-parameterized-builds: - - project: 'odp-api-check' + - project: 'odp-api-check odp-publish' predefined-parameters: GIT_BRANCH=${GIT_BRANCH} condition: SUCCESS diff --git a/trigger-build-odp-next.yaml b/trigger-build-odp-next.yaml index 7bd778a3fe..3d082a5496 100644 --- a/trigger-build-odp-next.yaml +++ b/trigger-build-odp-next.yaml @@ -35,6 +35,6 @@ name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}' publishers: - trigger-parameterized-builds: - - project: 'odp-api-check' + - project: 'odp-api-check odp-publish' predefined-parameters: GIT_BRANCH=${GIT_BRANCH} condition: SUCCESS diff --git a/trigger-build-odp.yaml b/trigger-build-odp.yaml index 591cc5bcc0..8f9c88703b 100644 --- a/trigger-build-odp.yaml +++ b/trigger-build-odp.yaml @@ -31,4 +31,4 @@ name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}' builders: - trigger-builds: - - project: 'build-odp-deb, build-odp-rpm, openembedded-odp-rootfs, odp-debian-validation odp-api-check' + - project: 'build-odp-deb, build-odp-rpm, openembedded-odp-rootfs, odp-debian-validation odp-api-check odp-publish' |