aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/ci-apps-verify/ci-apps-jjb.yaml2
-rw-r--r--jjb/common/include-agl-skipmaster.sh6
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