X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng%2Fcompass4nfv-docker.yaml;h=2eb2a207cfd61484317702d6779f01593202f7a3;hb=b7871b1916fc8941c39950a9fb05308432a3a065;hp=d9a8b92274d05331d80d8ed361c9d1c7af1341e8;hpb=ade23398c6b761e6f6a40568ee75ed5f241ad5f4;p=releng.git

diff --git a/jjb/releng/compass4nfv-docker.yaml b/jjb/releng/compass4nfv-docker.yaml
index d9a8b9227..2eb2a207c 100644
--- a/jjb/releng/compass4nfv-docker.yaml
+++ b/jjb/releng/compass4nfv-docker.yaml
@@ -15,14 +15,17 @@
       - euphrates:
           branch: 'stable/{stream}'
           disabled: true
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
 
     arch_tag:
       - 'amd64':
           slave_label: 'opnfv-build-ubuntu'
-          dockerfile: 'Dockerfile'
+          docker_file: 'Dockerfile'
       - 'arm64':
           slave_label: 'opnfv-build-ubuntu-arm'
-          dockerfile: 'Dockerfile-arm64'
+          docker_file: 'Dockerfile-arm64'
 
     # yamllint disable rule:key-duplicates
     image:
@@ -43,7 +46,6 @@
         PUSH_IMAGE=$PUSH_IMAGE
         COMMIT_ID=$COMMIT_ID
         GERRIT_REFNAME=$GERRIT_REFNAME
-        DOCKERFILE=$DOCKERFILE
       kill-phase-on: FAILURE
       abort-all-jobs: false
 
@@ -77,6 +79,8 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: 'opnfv-build-ubuntu'
+          docker_file: 'Dockerfile'
+          arch_tag: 'amd64'
 
     properties:
       - throttle:
@@ -163,6 +167,8 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: '{slave_label}'
+          docker_file: '{docker_file}'
+          arch_tag: '{arch_tag}'
       - string:
           name: DOCKER_REPO_NAME
           default: "opnfv/compass-{image}"
@@ -171,14 +177,6 @@
           name: DOCKER_DIR
           default: "compass-{image}"
           description: "Directory containing files needed by the Dockerfile"
-      - string:
-          name: DOCKERFILE
-          default: '{dockerfile}'
-          description: "Dockerfile to use for creating the image."
-      - string:
-          name: ARCH_TAG
-          default: "{arch_tag}"
-          description: "If set, this value will be added to the docker image tag as a prefix"
     scm:
       - git-scm
     builders:
@@ -193,19 +191,23 @@
           project: '{project}'
           branch: '{branch}'
           slave_label: 'opnfv-build-ubuntu'
+          docker_file: 'Dockerfile'
+          arch_tag: 'amd64'
     builders:
       - shell: |
           #!/bin/bash -ex
           case "{stream}" in
           "master")
-              tag="latest" ;;
+              sudo manifest-tool push from-args \
+                  --platforms linux/amd64,linux/arm64 \
+                  --template opnfv/compass-{image}:ARCH-latest \
+                  --target opnfv/compass-{image}:latest ;;
           *)
-              tag="{stream}" ;;
+              sudo manifest-tool push from-args \
+                  --platforms linux/amd64,linux/arm64 \
+                  --template opnfv/compass-{image}:ARCH-stable \
+                  --target opnfv/compass-{image}:{stream} ;;
           esac
-          sudo manifest-tool push from-args \
-              --platforms linux/amd64,linux/arm64 \
-              --template opnfv/compass-{image}:ARCH-$tag \
-              --target opnfv/compass-{image}:$tag
           exit $?
 
 # parameter macro
@@ -219,6 +221,8 @@
           name: SLAVE_LABEL
           default: '{slave_label}'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -235,6 +239,14 @@
           name: GERRIT_REFNAME
           default: ""
           description: "Docker tag to be built, e.g. refs/tags/5.0.0, refs/tags/opnfv-5.0.0, refs/tags/5.0.RC1"
+      - string:
+          name: DOCKERFILE
+          default: '{docker_file}'
+          description: "Dockerfile to use for creating the image."
+      - string:
+          name: ARCH_TAG
+          default: "{arch_tag}"
+          description: "If set, this value will be added to the docker image tag as a prefix"
       - string:
           name: PROJECT
           default: "{project}"
@@ -246,9 +258,7 @@
     publishers:
       - email:
           recipients: >
-            chigang@huawei.com
-            huangxiangyui5@huawei.com
-            xueyifei@huawei.com
+            huangxiangyu5@huawei.com
             wutianwei1@huawei.com
 
 - publisher: