Skip to content
Snippets Groups Projects
Commit 11f225de authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Merge branch 'malowe/master/update-jenkins-build' into 'master'

Update Jenkinsbuild to use buildagent for project build stage

See merge request !24
parents 8f91b44e c1c838c0
No related branches found
No related tags found
1 merge request!24Update Jenkinsbuild to use buildagent for project build stage
Pipeline #2999 failed
...@@ -109,20 +109,22 @@ ...@@ -109,20 +109,22 @@
stages { stages {
stage('Build Java code') { stage('Build Java code') {
steps { steps {
readTrusted 'Makefile' container('buildcontainer') {
readTrusted './bin/maxmind.sh' readTrusted 'Makefile'
readTrusted 'mvnw' readTrusted './bin/maxmind.sh'
readTrusted '.mvn/wrapper/MavenWrapperDownloader.java' readTrusted 'mvnw'
readTrusted 'pom.xml' readTrusted '.mvn/wrapper/MavenWrapperDownloader.java'
readTrusted 'pom.xml'
withCredentials([string(credentialsId: 'maxmind-license-key', variable: 'MAXMIND_LICENSE_KEY')]) {
sh 'mkdir -p /tmp/maxmind && ./bin/maxmind.sh /tmp/maxmind' withCredentials([string(credentialsId: 'maxmind-license-key', variable: 'MAXMIND_LICENSE_KEY')]) {
} sh 'mkdir -p /tmp/maxmind && ./bin/maxmind.sh /tmp/maxmind'
}
sh 'make production-build'
stash includes: 'target/', name: 'target' sh 'make production-build'
dir('/tmp') { stash includes: 'target/', name: 'target'
stash includes: 'maxmind/', name: 'maxmind' dir('/tmp') {
stash includes: 'maxmind/', name: 'maxmind'
}
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment