Merge pull request #55249 from bryceml/master

we no longer need a separate git fetch

.ci/docs

@@ -2,7 +2,6 @@
 
 // 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')),

.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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '-n integration.modules.test_pkg'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '-n integration.modules.test_pkg'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-cloud

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py2'
 def nox_env_name = 'runtests-cloud'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def use_spot_instances = true
@@ -25,7 +24,6 @@ runTests(
     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-m2crypto

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq-m2crypto'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-proxy

@@ -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,7 +7,6 @@ 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 = 'master'
 def nox_passthrough_opts = '--proxy'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-pycryptodomex

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq-pycryptodomex'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-tcp

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py2'
 def nox_env_name = 'runtests-tcp'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-tornado

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py2'
 def nox_env_name = 'runtests-tornado'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-py3-cloud

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py3'
 def nox_env_name = 'runtests-cloud'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def use_spot_instances = true
@@ -25,7 +24,6 @@ runTests(
     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-py3-m2crypto

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq-m2crypto'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-py3-proxy

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--proxy'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-py3-pycryptodomex

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq-pycryptodomex'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-py3-tcp

@@ -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,7 +7,6 @@ def distro_name = 'centos'
 def distro_version = '7'
 def python_version = 'py3'
 def nox_env_name = 'runtests-tcp'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-debian10-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,7 +7,6 @@ def distro_name = 'debian'
 def distro_version = '10'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-debian8-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,7 +7,6 @@ def distro_name = 'debian'
 def distro_version = '8'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-debian9-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,7 +7,6 @@ def distro_name = 'debian'
 def distro_version = '9'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-debian9-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,7 +7,6 @@ def distro_name = 'debian'
 def distro_version = '9'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-fedora30-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,7 +7,6 @@ def distro_name = 'fedora'
 def distro_version = '30'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-fedora30-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,7 +7,6 @@ def distro_name = 'fedora'
 def distro_version = '30'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-macosxhighsierra-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
@@ -10,7 +10,6 @@ def distro_name = 'macosx'
 def distro_version = 'highsierra'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def concurrent_builds = 1
@@ -40,7 +39,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         "NOX_ENV_NAME=${nox_env_name}",
         'NOX_ENABLE_FROM_FILENAMES=true',
         "NOX_PASSTHROUGH_OPTS=${nox_passthrough_opts}",
-        "SALT_TARGET_BRANCH=${salt_target_branch}",
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "PATH=/Users/parallels/.rbenv/shims:/Users/parallels/.rbenv/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/salt/bin:/usr/local/sbin",
         'RBENV_VERSION=2.6.3',
@@ -65,7 +63,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         stage('Clone') {
             cleanWs notFailBuild: true
             checkout scm
-            sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
         }
 
         // Setup the kitchen required bundle

.ci/kitchen-macosxhighsierra-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
@@ -10,7 +10,6 @@ def distro_name = 'macosx'
 def distro_version = 'highsierra'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def concurrent_builds = 1
@@ -40,7 +39,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         "NOX_ENV_NAME=${nox_env_name}",
         'NOX_ENABLE_FROM_FILENAMES=true',
         "NOX_PASSTHROUGH_OPTS=${nox_passthrough_opts}",
-        "SALT_TARGET_BRANCH=${salt_target_branch}",
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "PATH=/Users/parallels/.rbenv/shims:/Users/parallels/.rbenv/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/salt/bin:/usr/local/sbin",
         'RBENV_VERSION=2.6.3',
@@ -65,7 +63,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         stage('Clone') {
             cleanWs notFailBuild: true
             checkout scm
-            sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
         }
 
         // Setup the kitchen required bundle

.ci/kitchen-macosxmojave-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
@@ -10,7 +10,6 @@ def distro_name = 'macosx'
 def distro_version = 'mojave'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def concurrent_builds = 1
@@ -40,7 +39,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         "NOX_ENV_NAME=${nox_env_name}",
         'NOX_ENABLE_FROM_FILENAMES=true',
         "NOX_PASSTHROUGH_OPTS=${nox_passthrough_opts}",
-        "SALT_TARGET_BRANCH=${salt_target_branch}",
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "PATH=/Users/parallels/.rbenv/shims:/Users/parallels/.rbenv/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/salt/bin:/usr/local/sbin",
         'RBENV_VERSION=2.6.3',
@@ -65,7 +63,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         stage('Clone') {
             cleanWs notFailBuild: true
             checkout scm
-            sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
         }
 
         // Setup the kitchen required bundle

.ci/kitchen-macosxmojave-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
@@ -10,7 +10,6 @@ def distro_name = 'macosx'
 def distro_version = 'mojave'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def concurrent_builds = 1
@@ -40,7 +39,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         "NOX_ENV_NAME=${nox_env_name}",
         'NOX_ENABLE_FROM_FILENAMES=true',
         "NOX_PASSTHROUGH_OPTS=${nox_passthrough_opts}",
-        "SALT_TARGET_BRANCH=${salt_target_branch}",
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "PATH=/Users/parallels/.rbenv/shims:/Users/parallels/.rbenv/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/salt/bin:/usr/local/sbin",
         'RBENV_VERSION=2.6.3',
@@ -65,7 +63,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         stage('Clone') {
             cleanWs notFailBuild: true
             checkout scm
-            sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
         }
 
         // Setup the kitchen required bundle

.ci/kitchen-macosxsierra-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
@@ -10,7 +10,6 @@ def distro_name = 'macosx'
 def distro_version = 'sierra'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def concurrent_builds = 1
@@ -40,7 +39,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         "NOX_ENV_NAME=${nox_env_name}",
         'NOX_ENABLE_FROM_FILENAMES=true',
         "NOX_PASSTHROUGH_OPTS=${nox_passthrough_opts}",
-        "SALT_TARGET_BRANCH=${salt_target_branch}",
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "PATH=/Users/parallels/.rbenv/shims:/Users/parallels/.rbenv/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/salt/bin:/usr/local/sbin",
         'RBENV_VERSION=2.6.3',
@@ -65,7 +63,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         stage('Clone') {
             cleanWs notFailBuild: true
             checkout scm
-            sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
         }
 
         // Setup the kitchen required bundle

.ci/kitchen-macosxsierra-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
@@ -10,7 +10,6 @@ def distro_name = 'macosx'
 def distro_version = 'sierra'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = ''
 def concurrent_builds = 1
@@ -40,7 +39,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         "NOX_ENV_NAME=${nox_env_name}",
         'NOX_ENABLE_FROM_FILENAMES=true',
         "NOX_PASSTHROUGH_OPTS=${nox_passthrough_opts}",
-        "SALT_TARGET_BRANCH=${salt_target_branch}",
         "GOLDEN_IMAGES_CI_BRANCH=${golden_images_branch}",
         "PATH=/Users/parallels/.rbenv/shims:/Users/parallels/.rbenv/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/salt/bin:/usr/local/sbin",
         'RBENV_VERSION=2.6.3',
@@ -65,7 +63,6 @@ wrappedNode(jenkins_slave_label, global_timeout, '#jenkins-prod-pr') {
         stage('Clone') {
             cleanWs notFailBuild: true
             checkout scm
-            sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
         }
 
         // Setup the kitchen required bundle

.ci/kitchen-opensuse15-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,7 +7,6 @@ def distro_name = 'opensuse'
 def distro_version = '15'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-opensuse15-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,7 +7,6 @@ def distro_name = 'opensuse'
 def distro_version = '15'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py2-m2crypto

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq-m2crypto'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py2-proxy

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--proxy'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py2-pycryptodomex

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq-pycryptodomex'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py2-tcp

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py2'
 def nox_env_name = 'runtests-tcp'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py2-tornado

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py2'
 def nox_env_name = 'runtests-tornado'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py3-m2crypto

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq-m2crypto'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py3-proxy

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--proxy'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py3-pycryptodomex

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq-pycryptodomex'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1604-py3-tcp

@@ -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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1604'
 def python_version = 'py3'
 def nox_env_name = 'runtests-tcp'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1804-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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1804'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-ubuntu1804-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,7 +7,6 @@ def distro_name = 'ubuntu'
 def distro_version = '1804'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--ssh-tests'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-windows2016-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 = 8
@@ -7,7 +7,6 @@ def distro_name = 'windows'
 def distro_version = '2016'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--unit'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-windows2016-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 = 8
@@ -7,7 +7,6 @@ def distro_name = 'windows'
 def distro_version = '2016'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--unit'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-windows2019-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 = 8
@@ -7,7 +7,6 @@ def distro_name = 'windows'
 def distro_version = '2019'
 def python_version = 'py2'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--unit'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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-windows2019-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 = 8
@@ -7,7 +7,6 @@ def distro_name = 'windows'
 def distro_version = '2019'
 def python_version = 'py3'
 def nox_env_name = 'runtests-zeromq'
-def salt_target_branch = 'master'
 def golden_images_branch = 'master'
 def nox_passthrough_opts = '--unit'
 def concurrent_builds = 1
@@ -35,7 +34,6 @@ runTests(
     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/lint

@@ -30,7 +30,6 @@ wrappedNode('lint', global_timeout, '#jenkins-prod-pr') {
             stage('checkout-scm') {
                 cleanWs notFailBuild: true
                 checkout scm
-                sh 'git fetch --no-tags https://github.com/saltstack/salt.git +refs/heads/${SALT_TARGET_BRANCH}:refs/remotes/origin/${SALT_TARGET_BRANCH}'
             }
 
             // Setup the kitchen required bundle