diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-09-18 21:44:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2017-09-18 21:44:07 +0000 |
| commit | 82151816f48c58f35e7f603f1ecf64a5b64c3d5b (patch) | |
| tree | b10475a506799b0fa651e142342cb7c58278a900 | |
| parent | 6969d5332c7adacd5703d54734141a5f56e57e78 (diff) | |
| parent | 0dd4a29cb2bba9b60839907d320b56543a3cb0da (diff) | |
Merge "Enable CI specific DISTRO_FEATURES"
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh | 2 | ||||
| -rw-r--r-- | jjb/release-jjb-dab-snapshot/release-jjb-dab-snapshot.yaml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 6a4088a6..5f37bd1b 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -276,7 +276,7 @@ - ../common/include-agl-source-aglsetup.sh - ../common/include-agl-auto-conf.sh - ../common/include-agl-limit-parallelism.sh - #- ../common/include-agl-local-conf-fstypes.sh + - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh - ../common/include-agl-cat-auto-conf.sh - ../common/include-agl-bitbake-image.sh - ../common/include-agl-run-test-prepare.sh diff --git a/jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh b/jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh new file mode 100644 index 00000000..77b0058c --- /dev/null +++ b/jjb/common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh @@ -0,0 +1,2 @@ +# This is the big switch for in-CI builds +DISTRO_FEATURES_append = "AGLCI" diff --git a/jjb/release-jjb-dab-snapshot/release-jjb-dab-snapshot.yaml b/jjb/release-jjb-dab-snapshot/release-jjb-dab-snapshot.yaml index a7e3150f..d11fa7bf 100644 --- a/jjb/release-jjb-dab-snapshot/release-jjb-dab-snapshot.yaml +++ b/jjb/release-jjb-dab-snapshot/release-jjb-dab-snapshot.yaml @@ -96,7 +96,7 @@ - ../common/include-agl-cat-auto-conf.sh - ../common/include-agl-local-conf-archiver.sh - ../common/include-agl-local-conf-isafw.sh - #- ../common/include-agl-local-conf-fstypes.sh + - ../common/include-agl-local-conf-DISTROFEATURES-AGLCI.sh - ../common/include-agl-local-conf-vmdk.sh - ../common/include-agl-bitbake-image.sh - ../common/include-agl-bitbake-sdk.sh |