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

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 927a99a..804327a 100644 (file)
--- 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 0ba1684..c301957 100644 (file)
--- 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