X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-docker-jobs.yaml;h=869489098e5cb3a6edbc7ba4239284a02dfe7bda;hb=3f4e84a7401973f6449ff38f3ed4224a2572771a;hp=4967de55dc9cbf7bf88e9944620e97019a5b2a3e;hpb=ad80446126ee6c72ee07709b33fd016c5ea07e01;p=releng.git

diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml
index 4967de55d..869489098 100644
--- a/jjb/fuel/fuel-docker-jobs.yaml
+++ b/jjb/fuel/fuel-docker-jobs.yaml
@@ -29,6 +29,7 @@
       node-parameters: false
       predefined-parameters: |
         PUSH_IMAGE=$PUSH_IMAGE
+        CACHE_INVALIDATE=$CACHE_INVALIDATE
         COMMIT_ID=$COMMIT_ID
         GERRIT_REFNAME=$GERRIT_REFNAME
       kill-phase-on: FAILURE
@@ -69,6 +70,11 @@
       - throttle:
           max-per-node: 1
           option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'fuel-docker-.*'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm
@@ -108,6 +114,12 @@
           branch: '{branch}'
           slave_label: '{slave_label}'
           arch_tag: '{arch_tag}'
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'fuel-docker-build-.*'
+          blocking-level: 'NODE'
     scm:
       - git-scm
     builders:
@@ -132,6 +144,8 @@
           name: SLAVE_LABEL
           default: 'opnfv-build-ubuntu'
           description: 'Slave label on Jenkins'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
       - string:
           name: PROJECT
           default: "{project}"
@@ -161,6 +175,10 @@
               --platforms linux/amd64,linux/arm64 \
               --template $REPO/fuel:saltmaster-reclass-ARCH-$tag \
               --target $REPO/fuel:saltmaster-reclass-$tag
+          sudo manifest-tool push from-args \
+              --platforms linux/amd64,linux/arm64 \
+              --template $REPO/fuel:saltminion-maas-ARCH-$tag \
+              --target $REPO/fuel:saltminion-maas-$tag
           exit $?
 
 # parameter macro
@@ -174,6 +192,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
@@ -182,6 +202,10 @@
           name: PUSH_IMAGE
           default: "true"
           description: "To enable/disable pushing the image to Dockerhub."
+      - string:
+          name: CACHE_INVALIDATE
+          default: "0"
+          description: "Set to any non-zero value to force a Docker cache cleanup"
       - string:
           name: COMMIT_ID
           default: ""