commit 33535a02a66bfb7b5c1c5fbfd2e7eda019e7cb21
author Mike Marchetti <mmarchetti@sandvine.com> Wed Sep 19 16:31:09 2018 -0400
committer Mike Marchetti <mmarchetti@sandvine.com> Wed Sep 19 16:31:09 2018 -0400
tree 8832ff1020a02b4a4f64bc2b68b59f6426db2903
parent 13d76c8224da1ff6ad5181a03af9f4085dae95d4

Enable docker builds in stage_3

Change-Id: I0507dae0819c61d697b70430e38d50f8d513d4a6
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>

jenkins/ci-pipelines/ci_stage_3.groovy

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 44b8d76..fb4d565 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -34,6 +34,7 @@
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_FAIL'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_CONTAINER_ON_PASS'),
         booleanParam(defaultValue: false, description: '', name: 'DO_STAGE_4'),
+        booleanParam(defaultValue: true, description: '',  name: 'DO_BUILD'),
         booleanParam(defaultValue: false, description: '', name: 'DO_INSTALL'),
         booleanParam(defaultValue: false, description: '', name: 'DO_SMOKE'),
         booleanParam(defaultValue: false, description: '', name: 'SAVE_ARTIFACTS_OVERRIDE'),
@@ -153,6 +154,11 @@
     }
 
     error = null
+    if ( params.DO_BUILD ) {
+        stage("Build") {
+            sh "make -j4 -C docker CMD_DOCKER_ARGS= TAG=${container_name}"
+        }
+    }
 
     try {
         if ( params.DO_INSTALL ) {
@@ -189,6 +195,7 @@
                 sh """
                     export PATH=$PATH:/snap/bin
                     installers/full_install_osm.sh -y -s ${container_name} --test --nolxd --nodocker --nojuju --nohostports --nohostclient \
+                                                    --nodockerbuild -t ${container_name} \
                                                     ${commit_id} \
                                                     ${repo_distro} \
                                                     ${repo_base_url} \