Skip to content

Commit

Permalink
Merge pull request #53431 from saltstack/revert-53332-hotfix/full-tes…
Browse files Browse the repository at this point in the history 
…t-run-2019.2.1

Revert "Non optional full test runs for 2019.2.1"
  • Loading branch information
@dwoz
dwoz committed Jun 10, 2019
2 parents dfb6277 + 701218c commit d806b58
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 13 deletions.
5 changes: 4 additions & 1 deletion .ci/kitchen-centos6-py2
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py2',
'TEST_PLATFORM=centos-6',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-centos7-py2
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py2',
'TEST_PLATFORM=centos-7',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-centos7-py3
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py3',
'TEST_PLATFORM=centos-7',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-debian8-py2
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py2',
'TEST_PLATFORM=debian-8',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-debian8-py3
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py3',
'TEST_PLATFORM=debian-8',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-debian9-py2
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py2',
'TEST_PLATFORM=debian-9',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-debian9-py3
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py3',
'TEST_PLATFORM=debian-9',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-ubuntu1604-py2
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py2',
'TEST_PLATFORM=ubuntu-1604',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-ubuntu1604-py3
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py3',
'TEST_PLATFORM=ubuntu-1604',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-ubuntu1804-py2
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py2',
'TEST_PLATFORM=ubuntu-1804',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-ubuntu1804-py3
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -31,7 +34,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py3',
'TEST_PLATFORM=ubuntu-1804',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-windows2016-py2
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -30,7 +33,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py2',
'TEST_PLATFORM=windows-2016',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down
5 changes: 4 additions & 1 deletion .ci/kitchen-windows2016-py3
View file
Expand Up @@ -12,6 +12,9 @@ properties([
[
$class: 'RebuildSettings', autoRebuild: false, rebuildDisabled: false
],
parameters([
booleanParam(defaultValue: true, description: 'Run full test suite', name: 'runFull')
])
])
timeout(time: global_timeout, unit: 'HOURS') {
node('kitchen-slave') {
Expand All @@ -30,7 +33,7 @@ timeout(time: global_timeout, unit: 'HOURS') {
'TEST_SUITE=py3',
'TEST_PLATFORM=windows-2016',
'PY_COLORS=1',
'FORCE_FULL=true',
"FORCE_FULL=${params.runFull}",
]) {
// Set the GH status even before cloning the repo
stage('github-pending') {
Expand Down

0 comments on commit d806b58

Please sign in to comment.