From: Eric Ball <eball@linuxfoundation.org>
Date: Thu, 16 Apr 2020 19:01:42 +0000 (+0000)
Subject: Merge "iec-sonar: Disable git submodule cloning"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=commitdiff_plain;h=6bcbff746b5d4cc1a5a53d44979e04f685239612;hp=45ad64d7616bd03d489f393276ee19c0779516d1

Merge "iec-sonar: Disable git submodule cloning"
---

diff --git a/jjb/akraino-templates/akraino-validation-templates.yaml b/jjb/akraino-templates/akraino-validation-templates.yaml
index 8a64fed..33fb9be 100644
--- a/jjb/akraino-templates/akraino-validation-templates.yaml
+++ b/jjb/akraino-templates/akraino-validation-templates.yaml
@@ -23,9 +23,7 @@
             - 'validation-docker-.*'
           block-level: 'NODE'
 
-    triggers:
-      # Build nigtly at 12:10 AM
-      - timed: '10 0 * * *'
+    triggers: '{obj:triggers}'
 
     builders:
       - multijob:
diff --git a/jjb/iec/iec-seba_on_arm.sh b/jjb/iec/iec-seba_on_arm.sh
index 87b5189..b0a062c 100755
--- a/jjb/iec/iec-seba_on_arm.sh
+++ b/jjb/iec/iec-seba_on_arm.sh
@@ -9,7 +9,7 @@
 ##############################################################################
 
 export TERM="vt220"
-set -x
+set -ex
 
 echo "JOB_NAME=${JOB_NAME}"
 
@@ -101,7 +101,6 @@ case "${JOB_NAME}" in
     echo "${TEST_CMD}"
 
     eval ${TEST_CMD}
-    exit_code=$?
     ;;
   *)
     echo "Cannot determine what to do for seba_on_arm from ${JOB_NAME}"
diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml
index c8fffa6..539ed75 100644
--- a/jjb/validation/validation-docker.yaml
+++ b/jjb/validation/validation-docker.yaml
@@ -7,9 +7,28 @@
       - master:
           branch: '{stream}'
           disabled: false
+          triggers:
+            # Build nigtly at 12:10 AM
+            - timed: '10 0 * * *'
       - 3.0.0:
           branch: 'master'
           disabled: false
+          triggers:
+            - gerrit:
+                server-name: '{gerrit-server-name}'
+                trigger-on:
+                  - change-merged-event
+                  - comment-added-contains-event:
+                      comment-contains-value: remerge$
+                projects:
+                  - project-compare-type: ANT
+                    project-pattern: 'ci-management'
+                    branches:
+                      - branch-compare-type: ANT
+                        branch-pattern: '**/master'
+                    file-paths:
+                      - compare-type: REG_EXP
+                        pattern: 'jjb/validation/validation-docker.yaml'
 
     arch_tag:
       - 'amd64':