Merge branch '2017.7' into fix_48169

saltstack · Jul 20, 2018 · ead1972 · ead1972
2 parents 653fbcb + 1ebd96d
commit ead1972
Show file tree

Hide file tree

Showing 78 changed files with 3,637 additions and 525 deletions.
diff --git a/.ci/docs b/.ci/docs
@@ -1,8 +1,13 @@
 pipeline {
     agent { label 'docs' }
+    options {
+        timestamps()
+        ansiColor('xterm')
+    }
     environment {
         PYENV_ROOT = "/usr/local/pyenv"
         PATH = "$PYENV_ROOT/bin:$PATH"
+        PY_COLORS = 1
     }
     stages {
         stage('github-pending') {
@@ -22,11 +27,13 @@ pipeline {
         stage('build') {
             steps {
                 sh 'eval "$(pyenv init -)"; make -C doc clean html'
-                archiveArtifacts artifacts: 'doc/_build/html/'
             }
         }
     }
     post {
+        always {
+            cleanWs()
+        }
         success {
             githubNotify credentialsId: 'test-jenkins-credentials',
                 description: 'The docs job has passed',

diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
@@ -1,12 +1,17 @@
 pipeline {
     agent { label 'kitchen-slave' }
+    options {
+        timestamps()
+        ansiColor('xterm')
+    }
     environment {
         SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml"
         SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml"
         PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin"
         RBENV_VERSION = "2.4.2"
         TEST_SUITE = "py2"
         TEST_PLATFORM = "centos-7"
+        PY_COLORS = 1
     }
     stages {
         stage('github-pending') {
@@ -31,21 +36,25 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
                     script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
                         sshagent(credentials: ['jenkins-testing-ssh-key']) {
-                            sh 'ssh-add ~/.ssh/jenkins/jenkins-testing.pem'
+                            sh 'ssh-add ~/.ssh/jenkins-testing.pem'
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
+        always {
+            junit 'artifacts/xml-unittests-output/*.xml'
+            cleanWs()
+        }
         success {
             githubNotify credentialsId: 'test-jenkins-credentials',
                 description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",

diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
@@ -1,12 +1,17 @@
 pipeline {
     agent { label 'kitchen-slave' }
+    options {
+        timestamps()
+        ansiColor('xterm')
+    }
     environment {
         SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml"
         SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml"
         PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin"
         RBENV_VERSION = "2.4.2"
         TEST_SUITE = "py3"
         TEST_PLATFORM = "centos-7"
+        PY_COLORS = 1
     }
     stages {
         stage('github-pending') {
@@ -31,21 +36,25 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
                     script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
                         sshagent(credentials: ['jenkins-testing-ssh-key']) {
-                            sh 'ssh-add ~/.ssh/jenkins/jenkins-testing.pem'
+                            sh 'ssh-add ~/.ssh/jenkins-testing.pem'
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
+        always {
+            junit 'artifacts/xml-unittests-output/*.xml'
+            cleanWs()
+        }
         success {
             githubNotify credentialsId: 'test-jenkins-credentials',
                 description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",

diff --git a/.ci/kitchen-ubuntu1604-py2 b/.ci/kitchen-ubuntu1604-py2
@@ -1,12 +1,17 @@
 pipeline {
     agent { label 'kitchen-slave' }
+    options {
+        timestamps()
+        ansiColor('xterm')
+    }
     environment {
         SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml"
         SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml"
         PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin"
         RBENV_VERSION = "2.4.2"
         TEST_SUITE = "py2"
         TEST_PLATFORM = "ubuntu-1604"
+        PY_COLORS = 1
     }
     stages {
         stage('github-pending') {
@@ -31,21 +36,25 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
                     script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
                         sshagent(credentials: ['jenkins-testing-ssh-key']) {
-                            sh 'ssh-add ~/.ssh/jenkins/jenkins-testing.pem'
+                            sh 'ssh-add ~/.ssh/jenkins-testing.pem'
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
+        always {
+            junit 'artifacts/xml-unittests-output/*.xml'
+            cleanWs()
+        }
         success {
             githubNotify credentialsId: 'test-jenkins-credentials',
                 description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",

diff --git a/.ci/kitchen-ubuntu1604-py3 b/.ci/kitchen-ubuntu1604-py3
@@ -1,12 +1,17 @@
 pipeline {
     agent { label 'kitchen-slave' }
+    options {
+        timestamps()
+        ansiColor('xterm')
+    }
     environment {
         SALT_KITCHEN_PLATFORMS = "/var/jenkins/workspace/platforms.yml"
         SALT_KITCHEN_DRIVER = "/var/jenkins/workspace/driver.yml"
         PATH = "/usr/local/rbenv/shims/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/root/bin:/root/bin"
         RBENV_VERSION = "2.4.2"
         TEST_SUITE = "py3"
         TEST_PLATFORM = "ubuntu-1604"
+        PY_COLORS = 1
     }
     stages {
         stage('github-pending') {
@@ -31,21 +36,25 @@ pipeline {
                         sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
                     }
                 }}
-                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
             }
             post {
                 always {
                     script { withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
                         sshagent(credentials: ['jenkins-testing-ssh-key']) {
-                            sh 'ssh-add ~/.ssh/jenkins/jenkins-testing.pem'
+                            sh 'ssh-add ~/.ssh/jenkins-testing.pem'
                             sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
                         }
                     }}
+                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
                 }
             }
         }
     }
     post {
+        always {
+            junit 'artifacts/xml-unittests-output/*.xml'
+            cleanWs()
+        }
         success {
             githubNotify credentialsId: 'test-jenkins-credentials',
                 description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",

diff --git a/.ci/lint b/.ci/lint
@@ -1,8 +1,13 @@
 pipeline {
     agent { label 'pr-lint-slave' }
+    options {
+        timestamps()
+        ansiColor('xterm')
+    }
     environment {
         PYENV_ROOT = "/usr/local/pyenv"
         PATH = "$PYENV_ROOT/bin:$PATH"
+        PY_COLORS = 1
     }
     stages {
         stage('github-pending') {
@@ -16,29 +21,39 @@ pipeline {
         stage('setup') {
             steps {
                 sh 'eval "$(pyenv init -)"; pyenv install 2.7.14 || echo "We already have this python."; pyenv local 2.7.14; pyenv shell 2.7.14'
-                sh 'eval "$(pyenv init -)"; pip install pylint SaltPyLint'
-                sh 'eval "$(pyenv init -)"; which pylint; pylint --version'
+                sh 'eval "$(pyenv init -)"; pip install tox'
             }
         }
         stage('linting') {
             failFast false
             parallel {
                 stage('salt linting') {
                     steps {
-                        sh 'eval "$(pyenv init -)"; pylint --rcfile=.testing.pylintrc --disable=W1307,str-format-in-logging setup.py salt/ | tee pylint-report.xml'
+                        sh 'eval "$(pyenv init -)"; tox -e pylint-salt | tee pylint-report.xml'
                         archiveArtifacts artifacts: 'pylint-report.xml'
                     }
                 }
                 stage('test linting') {
                     steps {
-                        sh 'eval "$(pyenv init -)"; pylint --rcfile=.testing.pylintrc --disable=W0232,E1002,W1307,str-format-in-logging tests/ | tee pylint-report-tests.xml'
+                        sh 'eval "$(pyenv init -)"; tox -e pylint-tests | tee pylint-report-tests.xml'
                         archiveArtifacts artifacts: 'pylint-report-tests.xml'
                     }
                 }
             }
         }
     }
     post {
+        always {
+            step([$class: 'WarningsPublisher',
+                parserConfigurations: [[
+                    parserName: 'PyLint',
+                    pattern: 'pylint-report*.xml'
+                ]],
+                failedTotalAll: '1',
+                usePreviousBuildAsReference: true
+            ])
+            cleanWs()
+        }
         success {
             githubNotify credentialsId: 'test-jenkins-credentials',
                 description: 'The lint job has passed',

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -48,6 +48,7 @@ salt/spm/*                          @saltstack/team-spm
 # Team SSH
 salt/cli/ssh.py                     @saltstack/team-ssh
 salt/client/ssh/*                   @saltstack/team-ssh
+salt/roster/*                       @saltstack/team-ssh
 salt/runners/ssh.py                 @saltstack/team-ssh
 salt/**/thin.py                     @saltstack/team-ssh
 

diff --git a/.kitchen.yml b/.kitchen.yml
@@ -1,6 +1,6 @@
 ---
 <% vagrant = system('gem list -i kitchen-vagrant 2>/dev/null >/dev/null') %>
-<% version = '2017.7.4' %>
+<% version = '2017.7.6' %>
 <% platformsfile = ENV['SALT_KITCHEN_PLATFORMS'] || '.kitchen/platforms.yml' %>
 <% driverfile = ENV['SALT_KITCHEN_DRIVER'] || '.kitchen/driver.yml' %>
 <% verifierfile = ENV['SALT_KITCHEN_VERIFIER'] || '.kitchen/verifier.yml' %>
@@ -31,7 +31,7 @@ provisioner:
   salt_version: latest
   salt_bootstrap_url: https://bootstrap.saltstack.com
   salt_bootstrap_options: -X -p rsync stable <%= version %>
-  log_level: debug
+  log_level: info
   sudo: true
   require_chef: false
   retry_on_exit_code:

diff --git a/doc/conf.py b/doc/conf.py
@@ -251,7 +251,7 @@ def inner(fn, *iargs, **ikwargs):
 
 version = salt.version.__version__
 latest_release = '2018.3.2'  # latest release
-previous_release = '2017.7.6'  # latest release from previous branch
+previous_release = '2017.7.7'  # latest release from previous branch
 previous_release_dir = '2017.7'  # path on web server for previous branch
 next_release = ''  # next release
 next_release_dir = ''  # path on web server for next release branch

diff --git a/doc/man/salt-api.1 b/doc/man/salt-api.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-API" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-API" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-api \- salt-api Command
 .

diff --git a/doc/man/salt-call.1 b/doc/man/salt-call.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CALL" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-CALL" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-call \- salt-call Documentation
 .

diff --git a/doc/man/salt-cloud.1 b/doc/man/salt-cloud.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CLOUD" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-CLOUD" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-cloud \- Salt Cloud Command
 .

diff --git a/doc/man/salt-cp.1 b/doc/man/salt-cp.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-CP" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-CP" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-cp \- salt-cp Documentation
 .

diff --git a/doc/man/salt-key.1 b/doc/man/salt-key.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-KEY" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-KEY" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-key \- salt-key Documentation
 .

diff --git a/doc/man/salt-master.1 b/doc/man/salt-master.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MASTER" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-MASTER" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-master \- salt-master Documentation
 .

diff --git a/doc/man/salt-minion.1 b/doc/man/salt-minion.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-MINION" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-MINION" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-minion \- salt-minion Documentation
 .

diff --git a/doc/man/salt-proxy.1 b/doc/man/salt-proxy.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-PROXY" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-PROXY" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-proxy \- salt-proxy Documentation
 .

diff --git a/doc/man/salt-run.1 b/doc/man/salt-run.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-RUN" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-RUN" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-run \- salt-run Documentation
 .

diff --git a/doc/man/salt-ssh.1 b/doc/man/salt-ssh.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SSH" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-SSH" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-ssh \- salt-ssh Documentation
 .

diff --git a/doc/man/salt-syndic.1 b/doc/man/salt-syndic.1
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "SALT-SYNDIC" "1" "May 07, 2018" "2017.7.6" "Salt"
+.TH "SALT-SYNDIC" "1" "Jun 14, 2018" "2017.7.7" "Salt"
 .SH NAME
 salt-syndic \- salt-syndic Documentation
 .