tcwg/round-robin.yaml.inc: Support precommit testing of developer's patches

... located on rsync-able locations.

Change-Id: I71519105104f8d327b5260da40023e7edf7b4eea

1 files changed, 50 insertions, 10 deletions

diff --git a/tcwg/round-robin.yaml.inc b/tcwg/round-robin.yaml.inc
index eeea6a0aff..3c43f1dbf2 100644
--- a/tcwg/round-robin.yaml.inc
+++ b/tcwg/round-robin.yaml.inc
@@ -45,7 +45,7 @@
           description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm'"
 
 - parameter:
-    name: build-parameters
+    name: all-component-parameters
     parameters:
 #if COMPONENTS_aosp_superproject
       - component-parameters:
@@ -97,6 +97,12 @@
           component: qemu
           default_git: '{default_git}'
 #endif
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
       - choice:
           name: update_baseline
           choices:
@@ -116,6 +122,29 @@
           ci_project: '{ci_project}'
           ci_config: '{ci_config}'
           distro: '{distro}'
+#if PRECOMMIT_yes
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - ignore
+          description: "What to do with baseline in this build"
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          distro: '{distro}'
+#endif
 
 - property:
     name: build-properties
@@ -489,8 +518,6 @@
 
             for i in artifacts/jenkins/trigger-precommit-*; do
               if [ -f $i ]; then
-                echo "update_baseline=ignore" >> $i
-                echo "notify=precommit" >> $i
                 echo "ci_project=$ci_project" >> $i
                 echo "ci_config=$ci_config" >> $i
                 echo "distro=$distro" >> $i
@@ -899,14 +926,27 @@
             for c in {components}; do
               eval "g=\$$$${{c}}_git"
               case "$g" in
-                "pw://"*)
+                "pw://"*|"ssh://"*)
                   # Handle pre-commit testing
-                  build_container_exec \
-                    ./jenkins-scripts/pw-apply.sh --ci_bot '{rr_project}' \
-                    --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
-                    --build_url "$BUILD_URL" \
-                    --pw_dir artifacts/jenkins/pw \
-                    &> artifacts/jenkins/pw-apply.log &
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh --ci_bot '{rr_project}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
                   res=0 && wait $! || res=$?
 
                   if [ "$res" != "0" ]; then