Merge branch 'master' into master-bp-53343

.ci/docs

@@ -2,20 +2,22 @@
 
 // Define the maximum time, in hours, that a test run should run for
 def global_timeout = 2
-def salt_target_branch = 'master'
 
 properties([
     buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')),
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > 1) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - 1)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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

@@ -1,4 +1,4 @@
-@Library('salt@master-1.2') _
+@Library('salt@master-1.3') _
 
 // Define the maximum time, in hours, that a test run should run for
 def testrun_timeout = 6
@@ -7,8 +7,7 @@ def distro_name = 'amazon'
 def distro_version = '1'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
-def golden_images_branch = '2019.2'
+def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
 def use_spot_instances = true
@@ -21,21 +20,23 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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,
     distro_name: distro_name,
     distro_version: distro_version,
     python_version: python_version,
-    salt_target_branch: salt_target_branch,
     golden_images_branch: golden_images_branch,
     nox_env_name: nox_env_name,
     nox_passthrough_opts: nox_passthrough_opts,

.ci/kitchen-amazon2-py2

@@ -1,4 +1,4 @@
-@Library('salt@master-1.2') _
+@Library('salt@master-1.3') _
 
 // Define the maximum time, in hours, that a test run should run for
 def testrun_timeout = 6
@@ -7,8 +7,7 @@ def distro_name = 'amazon'
 def distro_version = '2'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
-def golden_images_branch = '2019.2'
+def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
 def use_spot_instances = true
@@ -21,21 +20,23 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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,
     distro_name: distro_name,
     distro_version: distro_version,
     python_version: python_version,
-    salt_target_branch: salt_target_branch,
     golden_images_branch: golden_images_branch,
     nox_env_name: nox_env_name,
     nox_passthrough_opts: nox_passthrough_opts,

.ci/kitchen-amazon2-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.2') _
+@Library('salt@master-1.3') _
 
 // Define the maximum time, in hours, that a test run should run for
 def testrun_timeout = 6
@@ -7,8 +7,7 @@ def distro_name = 'amazon'
 def distro_version = '2'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
-def golden_images_branch = '2019.2'
+def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
 def use_spot_instances = true
@@ -21,21 +20,23 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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,
     distro_name: distro_name,
     distro_version: distro_version,
     python_version: python_version,
-    salt_target_branch: salt_target_branch,
     golden_images_branch: golden_images_branch,
     nox_env_name: nox_env_name,
     nox_passthrough_opts: nox_passthrough_opts,

.ci/kitchen-archlts-py2

@@ -1,4 +1,4 @@
-@Library('salt@master-1.2') _
+@Library('salt@master-1.3') _
 
 // Define the maximum time, in hours, that a test run should run for
 def testrun_timeout = 6
@@ -7,8 +7,7 @@ def distro_name = 'arch'
 def distro_version = 'lts'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
-def golden_images_branch = '2019.2'
+def golden_images_branch = 'master'
 def nox_passthrough_opts = '-n integration.modules.test_pkg'
 def concurrent_builds = 1
 def use_spot_instances = true
@@ -21,21 +20,23 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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,
     distro_name: distro_name,
     distro_version: distro_version,
     python_version: python_version,
-    salt_target_branch: salt_target_branch,
     golden_images_branch: golden_images_branch,
     nox_env_name: nox_env_name,
     nox_passthrough_opts: nox_passthrough_opts,

.ci/kitchen-archlts-py3

@@ -1,4 +1,4 @@
-@Library('salt@master-1.2') _
+@Library('salt@master-1.3') _
 
 // Define the maximum time, in hours, that a test run should run for
 def testrun_timeout = 6
@@ -7,8 +7,7 @@ def distro_name = 'arch'
 def distro_version = 'lts'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
-def golden_images_branch = '2019.2'
+def golden_images_branch = 'master'
 def nox_passthrough_opts = '-n integration.modules.test_pkg'
 def concurrent_builds = 1
 def use_spot_instances = true
@@ -21,21 +20,23 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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,
     distro_name: distro_name,
     distro_version: distro_version,
     python_version: python_version,
-    salt_target_branch: salt_target_branch,
     golden_images_branch: golden_images_branch,
     nox_env_name: nox_env_name,
     nox_passthrough_opts: nox_passthrough_opts,

.ci/kitchen-centos6-py2

@@ -1,4 +1,4 @@
-@Library('salt@master-1.2') _
+@Library('salt@master-1.3') _
 
 // Define the maximum time, in hours, that a test run should run for
 def testrun_timeout = 6
@@ -7,8 +7,7 @@ def distro_name = 'centos'
 def distro_version = '6'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
-def golden_images_branch = '2019.2'
+def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
 def use_spot_instances = true
@@ -21,21 +20,23 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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,
     distro_name: distro_name,
     distro_version: distro_version,
     python_version: python_version,
-    salt_target_branch: salt_target_branch,
     golden_images_branch: golden_images_branch,
     nox_env_name: nox_env_name,
     nox_passthrough_opts: nox_passthrough_opts,

.ci/kitchen-centos7-py2

@@ -1,4 +1,4 @@
-@Library('salt@master-1.2') _
+@Library('salt@master-1.3') _
 
 // Define the maximum time, in hours, that a test run should run for
 def testrun_timeout = 6
@@ -7,8 +7,7 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
-def golden_images_branch = '2019.2'
+def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
 def use_spot_instances = true
@@ -21,21 +20,23 @@ properties([
     ])
 ])
 
-// Be sure to cancel any previously running builds
-def buildNumber = env.BUILD_NUMBER as int
-if (buildNumber > concurrent_builds) {
-    // This will cancel the previous build which also defined a matching milestone
-    milestone(buildNumber - concurrent_builds)
+// Only set milestones on PR builds
+if (env.CHANGE_ID) {
+    // Be sure to cancel any previously running builds
+    def buildNumber = env.BUILD_NUMBER as int
+    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,
     distro_name: distro_name,
     distro_version: distro_version,
     python_version: python_version,
-    salt_target_branch: salt_target_branch,
     golden_images_branch: golden_images_branch,
     nox_env_name: nox_env_name,
     nox_passthrough_opts: nox_passthrough_opts,