diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-04-21 09:07:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-04-21 09:07:53 +0000 |
| commit | db2901e50c9053331f588e63630e944ea78f9cd8 (patch) | |
| tree | 9593058eaf81b2476fc7bdd2985162e270470fd0 | |
| parent | 7a49a2c3c2c789204055a2f0175cf42985d75eac (diff) | |
| parent | 92324e96f9cc73910db2d50781faf2d5ff545987 (diff) | |
Merge "Adding support for building android apks."
| -rw-r--r-- | jjb/cicn/cicn.yaml | 114 | ||||
| -rw-r--r-- | jjb/cicn/include-raw-cicn-android-sdk-build.sh | 8 |
2 files changed, 120 insertions, 2 deletions
diff --git a/jjb/cicn/cicn.yaml b/jjb/cicn/cicn.yaml index 7818db1d2..e46d4ad81 100644 --- a/jjb/cicn/cicn.yaml +++ b/jjb/cicn/cicn.yaml @@ -192,8 +192,6 @@ - 'cicn-viper-merge-{stream}-{os}' project: 'cicn' os: - - ubuntu1404: - repo-os-part: 'ubuntu.trusty.main' - ubuntu1604: repo-os-part: 'ubuntu.xenial.main' stream: @@ -221,6 +219,23 @@ - short - long +- project: + name: cicn-android-sdk + jobs: + - 'cicn-android-sdk-verify-{stream}-{os}' + - 'cicn-android-sdk-merge-{stream}-{os}' + project: 'cicn' + os: + - ubuntu1604: + repo-os-part: 'ubuntu.xenial.main' + stream: + - master: + branch: 'android-sdk/master' + repo-stream-part: 'master' + type: + - short + - long + - job-template: name: 'cicn-longbow-merge-{stream}-{os}' @@ -1500,4 +1515,99 @@ publishers: - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'cicn-android-sdk-merge-{stream}-{os}' + + project-type: freestyle + node: '{os}-basebuild-4c-4g' + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' + - timed: '@daily' + + builders: + - shell: + !include-raw-escape: + - include-raw-cicn-android-sdk-build.sh + publishers: + - archive: + artifacts: 'sdk/sdk/tools/apps/SdkController/bin/*.apk,iget_android/app/build/outputs/apk/*.apk,ccnxandroidmetis/MetisControl/build/outputs/apk/*.apk' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'cicn-android-sdk-verify-{stream}-{os}' + + project-type: freestyle + node: '{os}-basebuild-4c-4g' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: + - include-raw-cicn-android-sdk-build.sh + + publishers: + - fdio-infra-shiplogs: maven-version: 'mvn33-new'
\ No newline at end of file diff --git a/jjb/cicn/include-raw-cicn-android-sdk-build.sh b/jjb/cicn/include-raw-cicn-android-sdk-build.sh new file mode 100644 index 000000000..dc0054e8f --- /dev/null +++ b/jjb/cicn/include-raw-cicn-android-sdk-build.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# basic build script example +set -euxo pipefail +IFS=$'\n\t' + +pushd scripts +bash build-apk.sh +popd |