diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-10-29 11:31:06 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-10-29 11:31:32 +0200 |
| commit | 47e67bd0fc909dcd6021d168caea9ff0a2d43a67 (patch) | |
| tree | f9d7529b84de3e483b340eff52d836a6211d09a9 | |
| parent | 8fa95065c155b79e6a4bbcd2d74b51f764055024 (diff) | |
Prepare CI on master for new framework integration
During the last workshop the transition to the new framework was presented.
This change essentially deprecates the SMACK-based application framework.
To prepare the integration of it, we remove the deprecated components:
- skip application framework related tests on master branch
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: Ia75c40674f9233a351796107f70521b017a5ced9
| -rw-r--r-- | jjb/ci-apps-verify/ci-apps-jjb.yaml | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-skipmaster.sh | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml index 07ee96f2..bb14e19f 100644 --- a/jjb/ci-apps-verify/ci-apps-jjb.yaml +++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml @@ -557,6 +557,7 @@ - shell: # including from ../common into ci-apps-{project}-merge-{aglbranch}-CIB-{architecture} !include-raw-escape: + - ../common/include-agl-skipmaster.sh - ../common/include-apps-header.sh - ../common/include-apps-fetch-install-sdk.sh - ../common/include-apps-build-app.sh @@ -739,6 +740,7 @@ - shell: # including from ../common into ci-apps-{project}-verify-CIBT-{architecture} !include-raw-escape: + - ../common/include-agl-skipmaster.sh - ../common/include-agl-header.sh - ../common/include-agl-repo.sh #- ../common/include-agl-select.sh diff --git a/jjb/common/include-agl-skipmaster.sh b/jjb/common/include-agl-skipmaster.sh new file mode 100644 index 00000000..107a961a --- /dev/null +++ b/jjb/common/include-agl-skipmaster.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +# Do not execute on master branch (new appfw) +if test x"master" = x"${GERRIT_BRANCH}" ; then +exit 0 +fi |