Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-13 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Jenkinsfile cleanup

Browse Source
This commit is contained in:
Martin Stockhammer 2018-05-06 18:59:17 +02:00
parent 1f891cd2ea
commit 01423b24ba
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile vendored
View File

@ -28,7 +28,7 @@
* Only the war and zip artifacts are archived in the jenkins build archive.
*/
LABEL = 'ubuntu'
buildJdk = 'JDK 1.8 (latest)'
buildJdk = 'JDK 1.7 (latest)'
buildMvn = 'Maven 3.5.2'
deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
@ -50,7 +50,7 @@ pipeline {
}
post {
failure {
notifyBuild("Checkout failure (${currentBuild.currentResult})")
notifyBuild("Checkout failure")
}
}
}
@ -68,8 +68,6 @@ pipeline {
openTasksPublisher(disabled: true), pipelineGraphPublisher(disabled: true)]
)
{
sh "chmod 755 ./src/ci/scripts/prepareWorkspace.sh"
sh "./src/ci/scripts/prepareWorkspace.sh"
// Needs a lot of time to reload the repository files, try without cleanup
// Not sure, but maybe
// sh "rm -rf .repository"
@ -82,7 +80,7 @@ pipeline {
// -Dmaven.compiler.fork=false: Do not compile in a separate forked process
// -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail
// -Pci-build: Profile for CI-Server
sh "mvn clean deploy -B -U -e -fae -Dmaven.test.failure.ignore=true -T2 -Dmaven.compiler.fork=false -Pci-build"
sh "mvn clean deploy -B -U -e -fae -T2 -Dmaven.compiler.fork=true -Pci-build"
}
}
}
@ -95,12 +93,12 @@ pipeline {
script {
def previousResult = currentBuild.previousBuild?.result
if (previousResult && !currentBuild.resultIsWorseOrEqualTo(previousResult)) {
notifyBuild("Fixed: ${currentBuild.currentResult}")
notifyBuild("Fixed")
}
}
}
failure {
notifyBuild("Build / Test failure (${currentBuild.currentResult})")
notifyBuild("Failed in BuildAndDeploy stage")
}
}
}
@ -113,7 +111,7 @@ pipeline {
post {
unstable {
notifyBuild("Unstable Build (${currentBuild.currentResult})")
notifyBuild("Unstable Build")
}
always {
cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]

12
Jenkinsfile-itest
View File

@ -25,7 +25,7 @@
*/
LABEL = 'ubuntu'
buildJdk = 'JDK 1.8 (latest)'
buildJdk = 'JDK 1.7 (latest)'
buildMvn = 'Maven 3.5.2'
deploySettings = 'DefaultMavenSettingsProvider.1331204114925'
DOCKERHUB_CREDS = '10a5f89e-504b-11e8-945d-7fd7b29cc41c'
@ -47,7 +47,7 @@ pipeline {
}
post {
failure {
notifyBuild("Checkout failure (${currentBuild.currentResult})")
notifyBuild("Checkout failure")
}
}
}
@ -89,7 +89,7 @@ pipeline {
junit testResults: '**/target/failsafe-reports/TEST-*.xml'
}
failure {
notifyBuild("Build / Test failure (${currentBuild.currentResult})")
notifyBuild("Failed in htmlunit test stage")
}
}
}
@ -139,7 +139,7 @@ pipeline {
junit testResults: '**/target/failsafe-reports/TEST-*.xml'
}
failure {
notifyBuild("Build / Test failure (${currentBuild.currentResult})")
notifyBuild("Failed in chrome test stage")
}
}
}
@ -147,7 +147,7 @@ pipeline {
}
post {
unstable {
notifyBuild("Unstable Build (${currentBuild.currentResult})")
notifyBuild("Unstable Build")
}
always {
cleanWs deleteDirs: true, notFailBuild: true, patterns: [[pattern: '.repository', type: 'EXCLUDE']]
@ -156,7 +156,7 @@ pipeline {
script {
def previousResult = currentBuild.previousBuild?.result
if (previousResult && !currentBuild.resultIsWorseOrEqualTo(previousResult)) {
notifyBuild("Fixed: ${currentBuild.currentResult}")
notifyBuild("Fixed")
}
}
}