From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Wed, 19 Sep 2018 20:31:09 +0000 (-0400)
Subject: Enable docker builds in stage_3
X-Git-Tag: v5.0.0~122
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=33535a02a66bfb7b5c1c5fbfd2e7eda019e7cb21;p=osm%2Fdevops.git

Enable docker builds in stage_3

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

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 44b8d766..fb4d5651 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -34,6 +34,7 @@ properties([
         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 @@ node("${params.NODE}") {
     }
 
     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 @@ node("${params.NODE}") {
                 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} \