Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

disable the MacOS tests in jenkins #5119

Merged
merged 1 commit into from
Jun 15, 2018
Merged

disable the MacOS tests in jenkins #5119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,41 +154,41 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) {
}
}
},
macOS: {
setupStep('macos') { run ->
timeout(time: gotest_timeout, unit: 'MINUTES') {
run 'go get -v github.com/jstemmer/go-junit-report'
run "make gx-deps"

try {
run test + ' -tags="nofuse" 2>&1 | tee output'
run 'cat output | go-junit-report > junit-report-macos.xml'
} catch (err) {
throw err
} finally {
/* IGNORE TEST FAILS */
/* junit 'junit-report-*.xml' */
}
}
}
},
macSharness: {
setupStep('macos') { run ->
timeout(time: sharness_timeout, unit: 'MINUTES') {
run 'go get -v github.com/jstemmer/go-junit-report'
run "make gx-deps"

try {
run "make -j12 test/sharness/test-results/sharness.xml CONTINUE_ON_S_FAILURE=1 TEST_NO_FUSE=1"
} catch (err) {
throw err
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems just commenting this and line 167 would give the wanted effect, rather than commenting the entire thing. But since @magik6k initially developed it, I'll leave it up to him to decide.

Although, removing the builds fully feels wrong, as we want to make sure it at least runs somewhat on macOS

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to comment out the whole blocks imo

} finally {
/* IGNORE TEST FAILS */
/* junit allowEmptyResults: true, testResults: 'test/sharness/test-results/sharness.xml' */
}
}
}
},
//macOS: {
// setupStep('macos') { run ->
// timeout(time: gotest_timeout, unit: 'MINUTES') {
// run 'go get -v github.com/jstemmer/go-junit-report'
// run "make gx-deps"

// try {
// run test + ' -tags="nofuse" 2>&1 | tee output'
// run 'cat output | go-junit-report > junit-report-macos.xml'
// } catch (err) {
// throw err
// } finally {
// /* IGNORE TEST FAILS */
// /* junit 'junit-report-*.xml' */
// }
// }
// }
//},
//macSharness: {
// setupStep('macos') { run ->
// timeout(time: sharness_timeout, unit: 'MINUTES') {
// run 'go get -v github.com/jstemmer/go-junit-report'
// run "make gx-deps"

// try {
// run "make -j12 test/sharness/test-results/sharness.xml CONTINUE_ON_S_FAILURE=1 TEST_NO_FUSE=1"
// } catch (err) {
// throw err
// } finally {
// /* IGNORE TEST FAILS */
// /* junit allowEmptyResults: true, testResults: 'test/sharness/test-results/sharness.xml' */
// }
// }
// }
//},
)
}
}}