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

diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 07ee96f..bb14e19 100644 (file)
--- 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 (file)
index 0000000..107a961
--- /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