X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-docker-jobs.yaml;h=9b8b73140aebbaeef16b7651b33e36e81b518f5d;hb=refs%2Fchanges%2F86%2F15786%2F12;hp=0de21fb2b8ce249b9865cb220cda2e45d21ca673;hpb=8f00e059ea64956604ea2d23ebe46e4fda788cdf;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml
index 0de21fb2..9b8b7314 100644
--- a/jjb/lf-docker-jobs.yaml
+++ b/jjb/lf-docker-jobs.yaml
@@ -8,6 +8,9 @@
 - builder:
     name: lf-docker-get-container-tag
     builders:
+      - inject:
+          properties-content: |
+            DOCKER_ROOT={docker-root}
       - conditional-step:
           condition-kind: regex-match
           regex: git-describe-params
@@ -36,6 +39,7 @@
             DOCKER_NAME={docker-name}
             DOCKER_ROOT={docker-root}
             CONTAINER_PULL_REGISTRY={container-public-registry}
+            CONTAINER_PUSH_REGISTRY={container-push-registry}
       - shell: !include-raw-escape:
           - ../shell/docker-build.sh
 
@@ -68,8 +72,9 @@
     submodule-disable: false
     submodule-recursive: true
     submodule-timeout: 10
-    pre_docker_build_script: ''
-    post_docker_build_script: ''
+    pre_docker_build_script: '# pre docker build script goes here'
+    post_docker_build_script: '# post docker build script goes here'
+    docker-use-params-from: ''
     disable-job: 'false'
     docker-root: '$WORKSPACE'
     docker-build-args: ''
@@ -131,8 +136,15 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - shell: '{pre_docker_build_script}'
-      - lf-docker-get-container-tag
-      - lf-docker-build
+      - lf-docker-get-container-tag:
+          docker-use-params-from: '{docker-use-params-from}'
+          docker-root: '{docker-root}'
+      - lf-docker-build:
+          docker-build-args: '{docker-build-args}'
+          docker-name: '{docker-name}'
+          docker-root: '{docker-root}'
+          container-public-registry: '{container-public-registry}'
+          container-push-registry: '{container-push-registry}'
       - shell: '{post_docker_build_script}'
       - lf-provide-maven-settings-cleanup
 
@@ -161,11 +173,19 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - shell: '{pre_docker_build_script}'
-      - lf-docker-get-container-tag
-      - lf-docker-build
+      - lf-docker-get-container-tag:
+          docker-use-params-from: '{docker-use-params-from}'
+          docker-root: '{docker-root}'
+      - lf-docker-build:
+          docker-build-args: '{docker-build-args}'
+          docker-name: '{docker-name}'
+          docker-root: '{docker-root}'
+          container-public-registry: '{container-public-registry}'
+          container-push-registry: '{container-push-registry}'
       - shell: '{post_docker_build_script}'
       # Provided all steps have already passed, push the docker image
-      - lf-docker-push
+      - lf-docker-push:
+          container-push-registry: '{container-push-registry}'
       - lf-provide-maven-settings-cleanup
 
 #################