From 04e1b922db025d690ee6df5330b1b28959d69370 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Fri, 26 Jul 2019 13:00:19 -0400 Subject: [PATCH] Add trigger file paths for ric_robot_suite Also repair the docker root, container file path params. Signed-off-by: Lott, Christopher (cl778h) Change-Id: Ic12a7b59e3d5f402e374f7edd7c9bb0d193175be --- jjb/it-test/it-test.yaml | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml index 4089b638..491fcee5 100644 --- a/jjb/it-test/it-test.yaml +++ b/jjb/it-test/it-test.yaml @@ -39,10 +39,18 @@ project-name: '{name}' # image name docker-name: '{name}' - # subdirectory - docker-root: 'ric_robot_suite/docker/nanobot' + # start in parent directory with shared files + docker-root: ric_robot_suite + # dockerfile is in subdir of docker root + docker-build-args: -f docker/nanobot/Dockerfile + # tag file is in subdir + container-tag-yaml-dir: ric_robot_suite/docker/nanobot # maven settings file has docker credentials mvn-settings: it-test-settings + # build only on relevant changes + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'ric_robot_suite/.*' jobs: - '{project-name}-gerrit-docker-jobs' <<: *it_test_common @@ -55,10 +63,18 @@ project-name: '{name}' # image name docker-name: '{name}' - # subdirectory - docker-root: 'ric_robot_suite/docker/ric-robot' + # start in parent directory with shared files + docker-root: ric_robot_suite + # dockerfile is in subdir of docker root + docker-build-args: -f docker/ric-robot/Dockerfile + # tag file is in subdir + container-tag-yaml-dir: ric_robot_suite/docker/ric-robot # maven settings file has docker credentials mvn-settings: it-test-settings + # build only on relevant changes + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: 'ric_robot_suite/.*' jobs: - '{project-name}-gerrit-docker-jobs' <<: *it_test_common -- 2.16.6