-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'merge-forward/2018.3-to-2019.2' into merge-forward/2019…
….2-develop Conflicts: * salt/cli/batch.py * salt/client/mixins.py * salt/loader.py * salt/modules/beacons.py * salt/modules/event.py * salt/modules/saltutil.py * salt/payload.py * salt/runner.py * salt/runners/saltutil.py * salt/states/blockdev.py * salt/states/pip_state.py * salt/states/slack.py * salt/utils/args.py * tests/integration/__init__.py * tests/integration/doc/test_man.py * tests/integration/files/file/base/_modules/mantest.py * tests/integration/modules/test_pip.py * tests/integration/shell/test_syndic.py * tests/integration/states/test_docker_container.py * tests/integration/states/test_pip_state.py * tests/support/gitfs.py * tests/support/paths.py * tests/unit/fileserver/test_gitfs.py * tests/unit/modules/test_win_file.py * tests/unit/states/test_pip_state.py * tests/unit/utils/test_network.py * tests/unit/utils/test_schedule.py * tests/unit/utils/test_thin.py * tests/unit/utils/test_win_dacl.py
- Loading branch information
Showing
386 changed files
with
103,564 additions
and
65,787 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| properties([ | ||
| [ | ||
| $class: 'ScannerJobProperty', doNotScan: false | ||
| ], | ||
| [ | ||
| $class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false | ||
| ], | ||
| parameters([ | ||
| booleanParam(defaultValue: false, description: 'Run full test suite', name: 'runFull') | ||
| ]) | ||
| ]) | ||
| timeout(time: 8, unit: 'HOURS') { | ||
| node('kitchen-slave') { | ||
| timestamps { | ||
| ansiColor('xterm') { | ||
| withEnv([ | ||
| 'SALT_KITCHEN_PLATFORMS=/var/jenkins/workspace/nox-platforms.yml', | ||
| 'SALT_KITCHEN_VERIFIER=/var/jenkins/workspace/nox-verifier.yml', | ||
| 'SALT_KITCHEN_DRIVER=/var/jenkins/workspace/driver.yml', | ||
| 'NOX_ENV_NAME=runtests-zeromq', | ||
| 'NOX_PASSTHROUGH_OPTS=--ssh-tests', | ||
| 'NOX_ENABLE_FROM_FILENAMES=true', | ||
| 'GOLDEN_IMAGES_CI_BRANCH=2019.2', | ||
| 'CODECOV_FLAGS=centos6,py2', | ||
| '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-6', | ||
| 'PY_COLORS=1', | ||
| "FORCE_FULL=${params.runFull}", | ||
| ]) { | ||
| stage('checkout-scm') { | ||
| cleanWs notFailBuild: true | ||
| checkout scm | ||
| } | ||
| 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' | ||
| } | ||
| 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/*,artifacts/**/*' | ||
| } | ||
| stage('report code coverage') { | ||
| script { | ||
| withCredentials([[$class: 'StringBinding', credentialsId: 'codecov-upload-token-salt', variable: 'CODECOV_TOKEN']]) { | ||
| sh ''' | ||
| if [ -n "${FORCE_FULL}" -a "${FORCE_FULL}" = "true" -a -f artifacts/coverage/coverage.xml ]; then | ||
| curl -L https://codecov.io/bash | /bin/sh -s -- -R $(pwd) -s artifacts/coverage/ -F "${CODECOV_FLAGS}" | ||
| fi | ||
| ''' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } catch (Exception e) { | ||
| currentBuild.result = 'FAILURE' | ||
| } 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}" | ||
| try { | ||
| slackSend channel: "#jenkins-prod-pr", | ||
| color: '#FF0000', | ||
| message: "FAILED: PR-Job: '${env.JOB_NAME} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})" | ||
| } catch (Exception e) { | ||
| sh 'echo Failed to send the Slack notification' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // vi: ft=groovy |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.