Merge pull request #1 from saltstack/develop

merge upstream
saltstack · Oct 2, 2018 · 80466c1 · 80466c1
2 parents 093dfad + 2ba7c71
commit 80466c1
Show file tree

Hide file tree

Showing 846 changed files with 51,979 additions and 21,066 deletions.
diff --git a/.ci/docs b/.ci/docs
@@ -1,8 +1,16 @@
 pipeline {
-    agent { label 'docs' }
+    agent {
+        label 'docs'
+    }
+    options {
+        timestamps()
+        ansiColor('xterm')
+        timeout(time: 2, unit: 'HOURS')
+    }
     environment {
         PYENV_ROOT = "/usr/local/pyenv"
         PATH = "$PYENV_ROOT/bin:$PATH"
+        PY_COLORS = 1
     }
     stages {
         stage('github-pending') {

diff --git a/.ci/kitchen-centos7-py2 b/.ci/kitchen-centos7-py2
@@ -1,66 +1,80 @@
-pipeline {
-    agent { label 'kitchen-slave' }
-    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"
-    }
-    stages {
-        stage('github-pending') {
-            steps {
-                githubNotify credentialsId: 'test-jenkins-credentials',
-                    description: "running ${TEST_SUITE}-${TEST_PLATFORM}...",
-                    status: 'PENDING',
-                    context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
-            }
-        }
-        stage('setup') {
-            steps {
-                sh 'bundle install --with ec2 windows --without opennebula docker'
-            }
-        }
-        stage('run kitchen') {
-            steps {
-                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-testing.pem'
-                        sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM'
-                        sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
+timeout(time: 6, unit: 'HOURS') {
+    node('kitchen-slave') {
+        timestamps {
+            ansiColor('xterm') {
+                withEnv([
+                    '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',
+                ]) {
+                    stage('checkout-scm') {
+                        cleanWs notFailBuild: true
+                        checkout scm
                     }
-                }}
-            }
-            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-testing.pem'
-                            sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
+                    try {
+                        stage('github-pending') {
+                            githubNotify credentialsId: 'test-jenkins-credentials',
+                                description: "running ${TEST_SUITE}-${TEST_PLATFORM}...",
+                                status: 'PENDING',
+                                context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                        }
+                        stage('setup-bundle') {
+                            sh 'bundle install --with ec2 windows --without opennebula docker'
                         }
-                    }}
-                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
+                        try {
+                            stage('run kitchen') {
+                                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-testing.pem'
+                                        sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM'
+                                        sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
+                                    }
+                                }
+                            }
+                        } finally {
+                            stage('cleanup kitchen') {
+                                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-testing.pem'
+                                            sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
+                                        }
+                                    }
+                                }
+                                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
+                                archiveArtifacts artifacts: 'artifacts/logs/minion'
+                                archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
+                            }
+                        }
+                    } finally {
+                        try {
+                            junit 'artifacts/xml-unittests-output/*.xml'
+                        } finally {
+                            cleanWs notFailBuild: true
+                            def currentResult = currentBuild.result ?: 'SUCCESS'
+                            if (currentResult == 'SUCCESS') {
+                                githubNotify credentialsId: 'test-jenkins-credentials',
+                                    description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
+                                    status: 'SUCCESS',
+                                    context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                            } else {
+                                githubNotify credentialsId: 'test-jenkins-credentials',
+                                    description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
+                                    status: 'FAILURE',
+                                    context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                            }
+                        }
+                    }
                 }
             }
         }
     }
-    post {
-        always {
-            junit 'artifacts/xml-unittests-output/*.xml'
-            cleanWs()
-        }
-        success {
-            githubNotify credentialsId: 'test-jenkins-credentials',
-                description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
-                status: 'SUCCESS',
-                context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
-        }
-        failure {
-            githubNotify credentialsId: 'test-jenkins-credentials',
-                description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
-                status: 'FAILURE',
-                context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
-        }
-    }
 }
diff --git a/.ci/kitchen-centos7-py3 b/.ci/kitchen-centos7-py3
@@ -1,66 +1,80 @@
-pipeline {
-    agent { label 'kitchen-slave' }
-    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"
-    }
-    stages {
-        stage('github-pending') {
-            steps {
-                githubNotify credentialsId: 'test-jenkins-credentials',
-                    description: "running ${TEST_SUITE}-${TEST_PLATFORM}...",
-                    status: 'PENDING',
-                    context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
-            }
-        }
-        stage('setup') {
-            steps {
-                sh 'bundle install --with ec2 windows --without opennebula docker'
-            }
-        }
-        stage('run kitchen') {
-            steps {
-                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-testing.pem'
-                        sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM'
-                        sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
+timeout(time: 6, unit: 'HOURS') {
+    node('kitchen-slave') {
+        timestamps {
+            ansiColor('xterm') {
+                withEnv([
+                    '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',
+                ]) {
+                    stage('checkout-scm') {
+                        cleanWs notFailBuild: true
+                        checkout scm
                     }
-                }}
-            }
-            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-testing.pem'
-                            sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
+                    try {
+                        stage('github-pending') {
+                            githubNotify credentialsId: 'test-jenkins-credentials',
+                                description: "running ${TEST_SUITE}-${TEST_PLATFORM}...",
+                                status: 'PENDING',
+                                context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                        }
+                        stage('setup-bundle') {
+                            sh 'bundle install --with ec2 windows --without opennebula docker'
                         }
-                    }}
-                    archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
+                        try {
+                            stage('run kitchen') {
+                                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-testing.pem'
+                                        sh 'bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM || bundle exec kitchen converge $TEST_SUITE-$TEST_PLATFORM'
+                                        sh 'bundle exec kitchen verify $TEST_SUITE-$TEST_PLATFORM'
+                                    }
+                                }
+                            }
+                        } finally {
+                            stage('cleanup kitchen') {
+                                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-testing.pem'
+                                            sh 'bundle exec kitchen destroy $TEST_SUITE-$TEST_PLATFORM'
+                                        }
+                                    }
+                                }
+                                archiveArtifacts artifacts: 'artifacts/xml-unittests-output/*.xml'
+                                archiveArtifacts artifacts: 'artifacts/logs/minion'
+                                archiveArtifacts artifacts: 'artifacts/logs/salt-runtests.log'
+                            }
+                        }
+                    } finally {
+                        try {
+                            junit 'artifacts/xml-unittests-output/*.xml'
+                        } finally {
+                            cleanWs notFailBuild: true
+                            def currentResult = currentBuild.result ?: 'SUCCESS'
+                            if (currentResult == 'SUCCESS') {
+                                githubNotify credentialsId: 'test-jenkins-credentials',
+                                    description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
+                                    status: 'SUCCESS',
+                                    context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                            } else {
+                                githubNotify credentialsId: 'test-jenkins-credentials',
+                                    description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
+                                    status: 'FAILURE',
+                                    context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
+                            }
+                        }
+                    }
                 }
             }
         }
     }
-    post {
-        always {
-            junit 'artifacts/xml-unittests-output/*.xml'
-            cleanWs()
-        }
-        success {
-            githubNotify credentialsId: 'test-jenkins-credentials',
-                description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has passed",
-                status: 'SUCCESS',
-                context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
-        }
-        failure {
-            githubNotify credentialsId: 'test-jenkins-credentials',
-                description: "The ${TEST_SUITE}-${TEST_PLATFORM} job has failed",
-                status: 'FAILURE',
-                context: "jenkins/pr/${TEST_SUITE}-${TEST_PLATFORM}"
-        }
-    }
 }