From 94fcc9d99471f1c0b7952f2d6ed1c025b70ae6a1 Mon Sep 17 00:00:00 2001
From: Travis Nielsen <travisn@live.com>
Date: Wed, 18 Oct 2017 09:06:01 -0700
Subject: [PATCH 1/2] build: add flag to skip e2e tests

---
 Jenkinsfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6f26151a6..953d52da3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,11 +25,12 @@ pipeline {
                     if (body.contains("[skip ci]")) {
                          echo ("'[skip ci]' spotted in PR body text. Aborting.")
                          env.shouldBuild = "false"
-
+                    }
+                    if (body.contains("[skip tests]")) {
+                         env.shouldTest = "false"
                     }
                     if (body.contains("[smoke only]")) {
                           env.smokeOnly = "true"
-
                     }
                 }
             }
@@ -58,7 +59,7 @@ pipeline {
        stage('Integration Tests') {
             when {
                 expression {
-                    return env.shouldBuild != "false"
+                    return env.shouldBuild != "false" && env.shouldTest != "false"
                 }
             }
             steps{
@@ -91,7 +92,7 @@ pipeline {
         stage('Publish') {
             when {
                 expression {
-                    return env.shouldBuild != "false"
+                    return env.shouldBuild != "false" && env.shouldTest != "false"
                 }
             }
             environment {

From 75f3fd86bde5347aec3e08d798bfea8f7bb0addc Mon Sep 17 00:00:00 2001
From: Travis Nielsen <travisn@live.com>
Date: Wed, 18 Oct 2017 10:17:20 -0700
Subject: [PATCH 2/2] build: reduce concurrency of the build

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 953d52da3..32b24d659 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
                 }
             }
             steps {
-                sh 'build/run make -j\$(nproc) build.all'
+                sh 'build/run make -j4 build.all'
             }
         }
         stage('Unit Tests') {