commit ab305526f21ea6ece9b145aafc8272b4a0e5b440
author Andy Bavier <andy@opennetworking.org> Fri Mar 22 21:16:13 2019 +0000
committer Gerrit Code Review <gerrit@opencord.org> Fri Mar 22 21:16:13 2019 +0000
tree 60045cad1b8d0386f83bf3c1cb27c56a7bd78faa
parent a0349b06d6953df28badf57dbb4cbcac9f16472c
parent f159a2049f9488857c1456a67567ba0f6164c141

Merge "SEBA-556 Use Jenkins to publish VOLTHA :latest images to Docker Hub"

jjb/pipeline/voltha-publish.groovy

diff --git a/jjb/pipeline/voltha-publish.groovy b/jjb/pipeline/voltha-publish.groovy
index ecd6f25..a07d4f2 100644
--- a/jjb/pipeline/voltha-publish.groovy
+++ b/jjb/pipeline/voltha-publish.groovy
@@ -32,8 +32,12 @@
            #!/usr/bin/env bash
 
            pushd cord/incubator/voltha
-           VOLTHA_BUILD=docker DOCKER_CACHE_ARG=--no-cache TAG=${params.manifestBranch} make build
-
+           if [ "${params.manifestBranch}" != "master" ]
+           then
+             VOLTHA_BUILD=docker DOCKER_CACHE_ARG=--no-cache TAG=${params.manifestBranch} make build
+           else
+             VOLTHA_BUILD=docker DOCKER_CACHE_ARG=--no-cache make build
+           fi
            popd
            """
       }
@@ -46,8 +50,12 @@
             #!/usr/bin/env bash
 
             pushd cord/incubator/voltha
-            VOLTHA_BUILD=docker TAG=${params.manifestBranch} TARGET_REPOSITORY=voltha/ TARGET_TAG=${params.manifestBranch} make push
-
+            if [ "${params.manifestBranch}" != "master" ]
+            then
+              VOLTHA_BUILD=docker TAG=${params.manifestBranch} TARGET_REPOSITORY=voltha/ TARGET_TAG=${params.manifestBranch} make push
+            else
+              VOLTHA_BUILD=docker TARGET_REPOSITORY=voltha/ make push
+            fi
             popd
             """
         }

jjb/voltha-publish.yaml

diff --git a/jjb/voltha-publish.yaml b/jjb/voltha-publish.yaml
index 8ec5c41..0e03be5 100644
--- a/jjb/voltha-publish.yaml
+++ b/jjb/voltha-publish.yaml
@@ -8,7 +8,7 @@
     jobs:
       - 'voltha-publish':
           project-regexp: 'voltha'
-          branch-regexp: 'voltha-1.6'
+          branch-regexp: '^(master|voltha-1.6)$'
           executor-node: 'imagebuilder'
           dependency-jobs: ''