From: Luis Gomez <ecelgp@gmail.com>
Date: Mon, 5 Jul 2021 23:48:36 +0000 (-0700)
Subject: Add changes to build ODL docker
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0689afdd44b66e3dfe76b247131b1a96c96bc487;p=releng%2Fbuilder.git

Add changes to build ODL docker

Change-Id: Ic03a24dc53918af44ee4794dc6003e65c1162c74
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---

diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml
index 227671f0b..53cc9f58f 100644
--- a/jjb/packaging/packaging.yaml
+++ b/jjb/packaging/packaging.yaml
@@ -11,6 +11,7 @@
     mvn-snapshot-id: packaging-snapshots
     nexus-snapshot-repo: opendaylight-snapshots
     tox-dir: "$WORKSPACE"
+    pre_docker_build_script: "$WORKSPACE/odl-docker/install_docker.sh"
     docker-name: odl-docker
     docker-root: "$WORKSPACE/odl-docker"
     build-node: centos7-docker-4c-4g
@@ -19,9 +20,6 @@
         pattern: "$WORKSPACE/.*"
     jobs:
       - gerrit-docker-verify:
-          docker-root: "$WORKSPACE"
-          docker-name: "odl-docker"
-          docker-build-args: "-f ./odl-docker/Dockerfile"
       - gerrit-docker-merge:
           post_docker_build_script: |
             #!/bin/bash