diff options
| author |   build.automotivelinux.org <jenkins@automotivelinux.org> | 2019-06-20 17:45:23 +0200 |
|---|---|---|
| committer | build.automotivelinux.org <jenkins@automotivelinux.org> | 2019-06-20 17:45:23 +0200 |
| commit | e2774de8fb58de4ac0649ba5ee4587bd0ad1a3d9 (patch) | |
| tree | f22665720118c08e12328a9eaac12d5a832ce26e | |
| parent | 75b660105ba855baa4e14ae9d1dff91ac36aa87d (diff) | |
Enhance CI checkout for meta-renesas-rcar-gen3 and disable naginator
The meta-renesas-rcar-gen3 layer is now in the subfolder bsp.
Also disable naginator.
Bug-AGL: SPEC-2450
Signed-off-by: build.automotivelinux.org <jenkins@automotivelinux.org>
Change-Id: I92aa66fb35d3ef254069a594297cffc11e260420
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 28 | ||||
| -rw-r--r-- | jjb/common/include-agl-select.sh | 6 |
2 files changed, 19 insertions, 15 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 927a99ac..804327af 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -321,13 +321,13 @@ - ../common/include-agl-bitbake-image.sh - ../common/include-agl-run-test-prepare.sh - ../common/include-agl-run-test-rsync-changeid.sh - publishers: - - naginator: - rerun-unstable-builds: true - progressive-delay-increment: 5 - progressive-delay-maximum: 15 - max-failed-builds: 2 - #regular-expression: "Unexpected termination of the channel" +# publishers: +# - naginator: +# rerun-unstable-builds: true +# progressive-delay-increment: 5 +# progressive-delay-maximum: 15 +# max-failed-builds: 2 +# #regular-expression: "Unexpected termination of the channel" ################################################################################ @@ -550,13 +550,13 @@ - ../common/include-agl-run-test-short.sh - ../common/include-agl-lava-jobs-submit.sh - publishers: - - naginator: - max-failed-builds: 2 - rerun-unstable-builds: true - progressive-delay-increment: 2 - progressive-delay-maximum: 6 - regular-expression: "/.*Timed out waiting for device dev-tty.*/" +# publishers: +# - naginator: +# max-failed-builds: 2 +# rerun-unstable-builds: true +# progressive-delay-increment: 2 +# progressive-delay-maximum: 6 +# regular-expression: "/.*Timed out waiting for device dev-tty.*/" ################################################################################ ################################################################################ diff --git a/jjb/common/include-agl-select.sh b/jjb/common/include-agl-select.sh index 0ba16846..c3019577 100644 --- a/jjb/common/include-agl-select.sh +++ b/jjb/common/include-agl-select.sh @@ -11,7 +11,11 @@ HANDLED="no" ################### if [[ ! x"yes" = x"$HANDLED" ]] && $(echo "$TARGETPROJECT" | grep -q "^AGL/"); then - MYPROJECT=`echo $TARGETPROJECT | sed -e "s#AGL/##g"` + if $(echo "$TARGETPROJECT" | grep -q "meta-renesas") ; then + MYPROJECT="bsp/$(echo $TARGETPROJECT | sed -e 's#AGL/##g')" + else + MYPROJECT=`echo $TARGETPROJECT | sed -e "s#AGL/##g"` + fi if test x"AGL-repo" = x"$MYPROJECT" ; then cd .repo/manifests |