From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Thu, 12 Nov 2020 17:42:44 +0000 (+0000)
Subject: Merge "Fix docker context for images being built."
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=d1c41b93aa4e6425a64c6cc60e995cb1bd554124;hp=c445f72ba18aa2e6db2d0d27f2e0a3ba34adddd0;p=ci-management.git

Merge "Fix docker context for images being built."
---

diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml
index 41fb199f..42bc3bff 100644
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -25,7 +25,6 @@
     # source of docker tag
     container-tag-method: yaml-file
     # if no container-tag-yaml-dir is defined, container-tag.yml is taken from the docker-root
-    docker-root: ntsimulator
     build-node: ubuntu1804-docker-4c-4g
     jobs:
       - '{project-name}-gerrit-docker-jobs'
@@ -44,6 +43,7 @@
     docker-build-args: '--network=host -f deploy/base/ubuntu.Dockerfile'
     # tag file latest, since it is base for others
     container-tag-method: latest
+    docker-root: ntsimulator
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'ntsimulator/ntsim-ng/.*'
@@ -58,7 +58,8 @@
     # image name
     docker-name: 'o-ran-sc/ntsim-ng-manager'
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/nts-manager/ubuntu.Dockerfile'
+    docker-build-args: '--network=host -f ubuntu.Dockerfile'
+    docker-root: ntsimulator/deploy/nts-manager
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'ntsimulator/deploy/nts-manager/.*'
@@ -71,7 +72,8 @@
     # image name
     docker-name: ' o-ran-sc/nts-ng-o-ran-fh'
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/o-ran/ubuntu.Dockerfile'
+    docker-build-args: '--network=host -f ubuntu.Dockerfile'
+    docker-root: ntsimulator/deploy/o-ran
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'ntsimulator/deploy/o-ran/.*'
@@ -84,7 +86,8 @@
     # image name
     docker-name: 'o-ran-sc/nts-ng-x-ran'
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/x-ran/ubuntu.Dockerfile'
+    docker-build-args: '--network=host -f ubuntu.Dockerfile'
+    docker-root: ntsimulator/deploy/x-ran
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'ntsimulator/deploy/x-ran/.*'