mirror of https://gitee.com/bigwinds/arangodb
enabled windows (#3078)
This commit is contained in:
Frank Celler
GitHub
parent
a14ffcd26e
commit
53e09e5e57
|
|
@ -14,7 +14,6 @@ def defaultBuild = true
|
|||
def defaultCleanBuild = false
|
||||
def defaultCommunity = true
|
||||
def defaultEnterprise = true
|
||||
def defaultJslint = true
|
||||
def defaultRunResilience = false
|
||||
def defaultRunTests = false
|
||||
def defaultFullParallel = false
|
||||
|
|
@ -56,11 +55,6 @@ properties([
|
|||
description: 'build and run tests for enterprise',
|
||||
name: 'Enterprise'
|
||||
),
|
||||
booleanParam(
|
||||
defaultValue: defaultJslint,
|
||||
description: 'run jslint',
|
||||
name: 'runJslint'
|
||||
),
|
||||
booleanParam(
|
||||
defaultValue: defaultRunResilience,
|
||||
description: 'run resilience tests',
|
||||
|
|
@ -95,9 +89,6 @@ useMac = params.Mac
|
|||
// build windows
|
||||
useWindows = params.Windows
|
||||
|
||||
// run jslint
|
||||
runJslint = params.runJslint
|
||||
|
||||
// run resilience tests
|
||||
runResilience = params.runResilience
|
||||
|
||||
|
|
@ -160,8 +151,8 @@ def checkoutCommunity() {
|
|||
}
|
||||
catch (exc) {
|
||||
echo "GITHUB checkout failed, retrying in 1min"
|
||||
echo exc.toString()
|
||||
sleep 60
|
||||
throw exc
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -265,35 +256,37 @@ def checkCommitMessages() {
|
|||
useWindows = false
|
||||
useCommunity = false
|
||||
useEnterprise = false
|
||||
runJslint = false
|
||||
runResilience = false
|
||||
runTests = false
|
||||
}
|
||||
else {
|
||||
if (env.BRANCH_NAME == "devel" || env.BRANCH_NAME == "3.2") {
|
||||
echo "build of main branch"
|
||||
|
||||
useLinux = true
|
||||
useMac = true
|
||||
useWindows = true
|
||||
useCommunity = true
|
||||
useEnterprise = true
|
||||
runJslint = true
|
||||
runResilience = true
|
||||
runTests = true
|
||||
}
|
||||
else if (env.BRANCH_NAME =~ /^PR-/) {
|
||||
echo "build of PR"
|
||||
|
||||
useLinux = true
|
||||
useMac = true
|
||||
useWindows = true
|
||||
fullParallel = true
|
||||
useCommunity = true
|
||||
useEnterprise = true
|
||||
runJslint = true
|
||||
runResilience = true
|
||||
runTests = true
|
||||
|
||||
restrictions = [
|
||||
"build-community-linux" : true,
|
||||
"build-community-mac" : true,
|
||||
// "build-community-windows" : true,
|
||||
"build-community-windows" : true,
|
||||
"build-enterprise-linux" : true,
|
||||
"build-enterprise-mac" : true,
|
||||
"build-enterprise-windows" : true,
|
||||
|
|
@ -314,7 +307,6 @@ def checkCommitMessages() {
|
|||
fullParallel = true
|
||||
useCommunity = true
|
||||
useEnterprise = true
|
||||
runJslint = true
|
||||
runResilience = true
|
||||
runTests = true
|
||||
|
||||
|
|
@ -343,7 +335,6 @@ Clean Build: ${cleanBuild}
|
|||
Full Parallel: ${fullParallel}
|
||||
Building Community: ${useCommunity}
|
||||
Building Enterprise: ${useEnterprise}
|
||||
Running Jslint: ${runJslint}
|
||||
Running Resilience: ${runResilience}
|
||||
Running Tests: ${runTests}
|
||||
|
||||
|
|
@ -401,12 +392,10 @@ def jslint() {
|
|||
}
|
||||
}
|
||||
|
||||
def jslintStep(edition) {
|
||||
def os = 'linux'
|
||||
|
||||
def jslintStep(edition, os) {
|
||||
return {
|
||||
node(os) {
|
||||
stage("jslint") {
|
||||
stage("jslint-${edition}-${os}") {
|
||||
echo "Running jslint test"
|
||||
|
||||
unstashBinaries(edition, os)
|
||||
|
|
@ -522,17 +511,19 @@ def testStep(edition, os, mode, engine) {
|
|||
def name = "${edition}-${os}-${mode}-${engine}"
|
||||
|
||||
stage("test-${name}") {
|
||||
try {
|
||||
unstashBinaries(edition, os)
|
||||
testEdition(edition, os, mode, engine)
|
||||
testsSuccess[name] = true
|
||||
}
|
||||
catch (exc) {
|
||||
echo "Exception while testing!"
|
||||
echo exc.toString()
|
||||
testsSuccess[name] = false
|
||||
allTestsSuccessful = false
|
||||
throw exc
|
||||
timeout(120) {
|
||||
try {
|
||||
unstashBinaries(edition, os)
|
||||
testEdition(edition, os, mode, engine)
|
||||
testsSuccess[name] = true
|
||||
}
|
||||
catch (exc) {
|
||||
echo "Exception while testing!"
|
||||
echo exc.toString()
|
||||
testsSuccess[name] = false
|
||||
allTestsSuccessful = false
|
||||
throw exc
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -557,12 +548,6 @@ def testStepParallel(editionList, osList, modeList) {
|
|||
}
|
||||
}
|
||||
|
||||
if (runJslint
|
||||
&& osList.contains('linux') && useLinux
|
||||
&& editionList.contains('community') && useCommunity) {
|
||||
branches['jslint'] = jslintStep('community')
|
||||
}
|
||||
|
||||
if (branches.size() > 1) {
|
||||
parallel branches
|
||||
}
|
||||
|
|
@ -642,8 +627,10 @@ def testResilienceStep(os, engine, foxx) {
|
|||
|
||||
try {
|
||||
try {
|
||||
unstashBinaries(edition, os)
|
||||
testResilience(os, engine, foxx)
|
||||
timeout(120) {
|
||||
unstashBinaries(edition, os)
|
||||
testResilience(os, engine, foxx)
|
||||
}
|
||||
|
||||
if (findFiles(glob: 'resilience/core*').length > 0) {
|
||||
error("found core file")
|
||||
|
|
@ -797,8 +784,11 @@ def buildStep(edition, os) {
|
|||
checkoutResilience()
|
||||
}
|
||||
|
||||
buildEdition(edition, os)
|
||||
stashBinaries(edition, os)
|
||||
timeout(90) {
|
||||
buildEdition(edition, os)
|
||||
stashBinaries(edition, os)
|
||||
}
|
||||
|
||||
buildsSuccess[name] = true
|
||||
}
|
||||
}
|
||||
|
|
@ -864,6 +854,19 @@ else {
|
|||
runStage { testResilienceParallel(['linux', 'mac', 'windows']) }
|
||||
}
|
||||
|
||||
if (buildsSuccess["enterprise-linux"]) {
|
||||
jslintStep('enterprise', 'linux')
|
||||
}
|
||||
else if (buildsSuccess["community-linux"]) {
|
||||
jslintStep('community', 'linux')
|
||||
}
|
||||
else if (buildsSuccess["enterprise-mac"]) {
|
||||
jslintStep('enterprise', 'mac')
|
||||
}
|
||||
else if (buildsSuccess["community-mac"]) {
|
||||
jslintStep('community', 'mac')
|
||||
}
|
||||
|
||||
stage('result') {
|
||||
node('master') {
|
||||
def result = ""
|
||||
|
|
|
|||
Loading…
Reference in New Issue