Merge branch 'master' into 2019_2_1_port_49293

.ci/docs

@@ -7,14 +7,17 @@ properties([
     buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')),
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > 1) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - 1)
+    if (buildNumber > 1) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - 1)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 def shell_header
 

.ci/kitchen-amazon1-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-amazon2-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-amazon2-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-archlts-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-archlts-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos6-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py2-m2crypto

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py2-proxy

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py2-pycryptodomex

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py2-tcp

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py2-tornado

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py3-m2crypto

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py3-proxy

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py3-pycryptodomex

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-centos7-py3-tcp

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-debian10-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-debian8-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-debian9-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-debian9-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-fedora30-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-fedora30-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-macosxhighsierra-py2

@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([

.ci/kitchen-macosxhighsierra-py3

@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([

.ci/kitchen-macosxmojave-py2

@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([

.ci/kitchen-macosxmojave-py3

@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([

.ci/kitchen-macosxsierra-py2

@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([

.ci/kitchen-macosxsierra-py3

@@ -22,14 +22,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
     withEnv([

.ci/kitchen-opensuse15-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-opensuse15-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py2-m2crypto

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py2-proxy

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py2-pycryptodomex

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py2-tcp

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py2-tornado

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py3-m2crypto

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py3-proxy

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py3-pycryptodomex

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1604-py3-tcp

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1804-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-ubuntu1804-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-windows2016-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-windows2016-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-windows2019-py2

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/kitchen-windows2019-py3

@@ -20,14 +20,17 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > concurrent_builds) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - concurrent_builds)
+    if (buildNumber > concurrent_builds) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - concurrent_builds)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 runTests(
     env: env,

.ci/lint

@@ -10,14 +10,17 @@ properties([
 
 def shell_header
 
-// Be sure to cancel any previously running builds
+// Only set milestones on PR builds
-def buildNumber = env.BUILD_NUMBER as int
+if (env.CHANGE_ID) {
-if (buildNumber > 1) {
+    // Be sure to cancel any previously running builds
-    // This will cancel the previous build which also defined a matching milestone
+    def buildNumber = env.BUILD_NUMBER as int
-    milestone(buildNumber - 1)
+    if (buildNumber > 1) {
+        // This will cancel the previous build which also defined a matching milestone
+        milestone(buildNumber - 1)
+    }
+    // Define a milestone for this build so that, if another build starts, this one will be aborted
+    milestone(buildNumber)
 }
-// Define a milestone for this build so that, if another build starts, this one will be aborted
-milestone(buildNumber)
 
 def lint_report_issues = []
 

salt/utils/pkg/rpm.py

@@ -21,7 +21,7 @@ log = logging.getLogger(__name__)
 # These arches compiled from the rpmUtils.arch python module source
 ARCHES_64 = ('x86_64', 'athlon', 'amd64', 'ia32e', 'ia64', 'geode')
 ARCHES_32 = ('i386', 'i486', 'i586', 'i686')
-ARCHES_PPC = ('ppc', 'ppc64', 'ppc64iseries', 'ppc64pseries')
+ARCHES_PPC = ('ppc', 'ppc64', 'ppc64le', 'ppc64iseries', 'ppc64pseries')
 ARCHES_S390 = ('s390', 's390x')
 ARCHES_SPARC = (
     'sparc', 'sparcv8', 'sparcv9', 'sparcv9v', 'sparc64', 'sparc64v'