1 files changed, 15 insertions, 2 deletions
diff --git a/netci.groovy b/netci.groovy
index 6e16a7135e..654fa9c789 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -995,7 +995,11 @@ def static getStressModeDisplayName(def scenario) {
         def prefixLength = 'COMPlus_'.length()
         if (k.length() >= prefixLength) {
             def modeName = k.substring(prefixLength, k.length())
-            displayStr += ' ' + modeName + '=' + v
+            if (displayStr != '') {
+                // Separate multiple variables with a space.
+                displayStr += ' '
+            }
+            displayStr += modeName + '=' + v
         }
     }
 
@@ -1300,8 +1304,11 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
             // TEMPORARY: make arm64 Linux innerloop jobs push jobs, not default triggered jobs, until we have experience
             //            with the machines running these jobs (and the jobs themselves), to understand how robust they are.
             // We should never get here (in the "innerloop cases) for non-PR jobs, except for this TEMPORARY exception.
+            // Only trigger the flow job, not the build job.
             assert (isInnerloopTestScenario(scenario) && (architecture == 'arm64') && (os == 'Ubuntu16.04') && (configuration == 'Checked'))
-            addGithubPushTriggerHelper(job)
+            if (isFlowJob) {
+                addGithubPushTriggerHelper(job)
+            }
             break
 
         case 'crossgen_comparison':
@@ -3643,6 +3650,12 @@ def static shouldGenerateFlowJob(def scenario, def isPR, def architecture, def c
     // The various "innerloop" jobs are only available as PR triggered.
 
     if (!isPR) {
+        if (isInnerloopTestScenario(scenario) && (architecture == 'arm64') && (os == 'Ubuntu16.04') && (configuration == 'Checked')) {
+            // TEMPORARY: make arm64 Linux innerloop jobs push jobs, not default triggered jobs, until we have experience
+            //            with the machines running these jobs (and the jobs themselves), to understand how robust they are.
+            return true
+        }
+
         if (isInnerloopTestScenario(scenario)) {
             return false
         }