Merge pull request #44 from jglick/Jenkinsfile

Switch Jenkinsfile to run docker-build explicitly
jenkinsci · Jun 19, 2019 · 0f47f07 · 0f47f07
2 parents 49b9c60 + 113e30f
commit 0f47f07
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,6 @@
+# syntax=docker/dockerfile:1.1.1-experimental
+FROM maven:3.6.1-jdk-8
+COPY . /src
+WORKDIR /src
+RUN rm -rf .git
+RUN --mount=type=cache,target=/root/.m2,sharing=private mvn -B -ntp -s settings-azure.xml -Darchetype.test.settingsFile=`pwd`/settings-azure.xml clean verify
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,18 +1,16 @@
 pipeline {
     options {
         buildDiscarder(logRotator(numToKeepStr: '20'))
-        timeout(time: 1, unit: 'HOURS')
     }
     agent {
-        docker {
-            image 'maven:3.5.0-jdk-8'
-            label 'docker'
-        }
+        label 'docker'
     }
     stages {
         stage('main') {
             steps {
-                sh 'mvn -B -s settings-azure.xml -Darchetype.test.settingsFile=`pwd`/settings-azure.xml clean verify'
+                timeout(time: 1, unit: 'HOURS') {
+                    sh 'docker version && DOCKER_BUILDKIT=1 docker build --progress plain --no-cache .'
+                }
             }
         }
     }

diff --git a/empty-plugin/src/test/resources/projects/testInstall/goal.txt b/empty-plugin/src/test/resources/projects/testInstall/goal.txt
@@ -1 +1 @@
-install
+install -ntp
diff --git a/global-configuration/src/test/resources/projects/testInstall/goal.txt b/global-configuration/src/test/resources/projects/testInstall/goal.txt
@@ -1 +1 @@
-install
+install -ntp
diff --git a/global-shared-library/src/test/resources/projects/testInstall/goal.txt b/global-shared-library/src/test/resources/projects/testInstall/goal.txt
@@ -1 +1 @@
-test
+test -ntp
diff --git a/hello-world/src/test/resources/projects/testInstall/goal.txt b/hello-world/src/test/resources/projects/testInstall/goal.txt
@@ -1 +1 @@
-install
+install -ntp
diff --git a/scripted-pipeline/src/test/resources/projects/testInstall/goal.txt b/scripted-pipeline/src/test/resources/projects/testInstall/goal.txt
@@ -1 +1 @@
-test
+test -ntp