Skip to content

Commit

Permalink
Merge branch 'master' into 2019_2_1_port_52933
Browse files Browse the repository at this point in the history
  • Loading branch information
dwoz authored Nov 13, 2019
2 parents c42547e + 50e89ab commit 183bfa4
Showing 80 changed files with 1,755 additions and 238 deletions.
1 change: 0 additions & 1 deletion .ci/docs
Original file line number Diff line number Diff line change
@@ -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')),
6 changes: 2 additions & 4 deletions .ci/kitchen-amazon1-py2
Original file line number Diff line number Diff line change
@@ -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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-amazon2-py2
Original file line number Diff line number Diff line change
@@ -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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-amazon2-py3
Original file line number Diff line number Diff line change
@@ -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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-archlts-py2
Original file line number Diff line number Diff line change
@@ -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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-archlts-py3
Original file line number Diff line number Diff line change
@@ -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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos6-py2
Original file line number Diff line number Diff line change
@@ -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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos7-py2
Original file line number Diff line number Diff line change
@@ -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
@@ -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,
24 changes: 6 additions & 18 deletions .ci/kitchen-fedora29-py2 → .ci/kitchen-centos7-py2-cloud
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
@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

def distro_name = 'fedora'
def distro_version = '29'
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 nox_passthrough_opts = '--ssh-tests'
def concurrent_builds = 1
def nox_env_name = 'runtests-cloud'
def golden_images_branch = 'master'
def nox_passthrough_opts = ''
def use_spot_instances = true
def jenkins_slave_label = 'kitchen-slave'

@@ -21,21 +19,11 @@ 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)
}
// 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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos7-py2-m2crypto
Original file line number Diff line number Diff line change
@@ -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-m2crypto'
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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos7-py2-proxy
Original file line number Diff line number Diff line change
@@ -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 = '--proxy'
def concurrent_builds = 1
def use_spot_instances = true
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos7-py2-pycryptodomex
Original file line number Diff line number Diff line change
@@ -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-pycryptodomex'
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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos7-py2-tcp
Original file line number Diff line number Diff line change
@@ -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-tcp'
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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos7-py2-tornado
Original file line number Diff line number Diff line change
@@ -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-tornado'
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
@@ -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,
6 changes: 2 additions & 4 deletions .ci/kitchen-centos7-py3
Original file line number Diff line number Diff line change
@@ -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 = '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
@@ -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,
Loading

0 comments on commit 183bfa4

Please sign in to comment.