From 3585eb3f817617a3f9f112b28911132296a40a5f Mon Sep 17 00:00:00 2001 From: Alex Stancu Date: Wed, 11 Nov 2020 20:05:13 +0200 Subject: [PATCH] Fix docker context for images being built. Issue-ID: SIM-38 Change-Id: Ia818d915932a1caf5b3d41afd8004a70d35f8a9e Signed-off-by: Alex Stancu --- jjb/sim-o1-interface/sim-o1-interface.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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/.*' -- 2.16.6