From 61b9a8f3abec22d6e511c809b1b0171deb322260 Mon Sep 17 00:00:00 2001 From: "Chen, Jackie" Date: Mon, 15 Jun 2020 16:06:45 -0400 Subject: [PATCH] updated it-otf.yaml to auto generate docker images for two new vths updated jjb file to reflect the two newly added VTHs. File was also trimmed for older projects. Change-Id: Ib7c653049e8649f669a0067d6ac6a9b9fefc21a7 Signed-off-by: Chen, Jackie --- jjb/it-otf/it-otf.yaml | 132 +++++++++++-------------------------------------- 1 file changed, 30 insertions(+), 102 deletions(-) diff --git a/jjb/it-otf/it-otf.yaml b/jjb/it-otf/it-otf.yaml index e4ff23de..8b681f7f 100644 --- a/jjb/it-otf/it-otf.yaml +++ b/jjb/it-otf/it-otf.yaml @@ -15,15 +15,25 @@ - it_otf_common: &it_otf_common # values apply to all it/otf docker projects - name: it-otf-docker-common + name: it_otf_common # git repo project: it/otf # jenkins job name prefix - project-name: it-otf + project-name: '{name}' # source of docker tag container-tag-method: yaml-file # maven settings file has docker credentials mvn-settings: it-otf-settings + # image name + docker-name: 'o-ran-sc/{name}' + # dockerfile is in subdir of docker root + docker-build-args: '--network=host -f ./docker/Dockerfile' + # tag file is in subdir + container-tag-yaml-dir: '{docker-root}/docker' + # build only on relevant changes + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: '{docker-root}/.*' jobs: - '{project-name}-gerrit-docker-jobs' stream: @@ -33,186 +43,104 @@ - project: <<: *it_otf_common name: it-otf-oran-ric-test-head - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: oran-ric-test-head # dockerfile is in subdir of docker root docker-build-args: '--network=host' # tag file is in subdir container-tag-yaml-dir: '{docker-root}' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-frontend - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-frontend # dockerfile is in subdir of docker root docker-build-args: '--network=host' # tag file is in subdir container-tag-yaml-dir: '{docker-root}' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-ping-test-head - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-ping-test-head # dockerfile is in subdir of docker root docker-build-args: '--network=host' # tag file is in subdir container-tag-yaml-dir: '{docker-root}' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-robot-test-head - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-robot-test-head # dockerfile is in subdir of docker root docker-build-args: '--network=host' # tag file is in subdir container-tag-yaml-dir: '{docker-root}' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-ssh-test-head - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-ssh-test-head # dockerfile is in subdir of docker root docker-build-args: '--network=host' # tag file is in subdir container-tag-yaml-dir: '{docker-root}' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-camunda - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-camunda - # dockerfile is in subdir of docker root - docker-build-args: '--network=host -f ./docker/Dockerfile' - # tag file is in subdir - container-tag-yaml-dir: '{docker-root}/docker' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-service-api - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: otf-service-api - # dockerfile is in subdir of docker root - docker-build-args: '--network=host -f ./docker/Dockerfile' - # tag file is in subdir - container-tag-yaml-dir: '{docker-root}/docker' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-smo-o1-vth - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: smo-o1-vth - # dockerfile is in subdir of docker root - docker-build-args: '--network=host -f ./docker/Dockerfile' - # tag file is in subdir - container-tag-yaml-dir: '{docker-root}/docker' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-dmaap-vth - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: dmaap-vth - # dockerfile is in subdir of docker root - docker-build-args: '--network=host -f ./docker/Dockerfile' - # tag file is in subdir - container-tag-yaml-dir: '{docker-root}/docker' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common name: it-otf-a1-mediator-vth - # jenkins job name prefix - project-name: '{name}' - # image name - docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files docker-root: a1-mediator-vth - # dockerfile is in subdir of docker root - docker-build-args: '--network=host -f ./docker/Dockerfile' - # tag file is in subdir - container-tag-yaml-dir: '{docker-root}/docker' - # build only on relevant changes - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{docker-root}/.*' - project: <<: *it_otf_common + name: it-otf-a1-sdnc-vth + # start in parent directory with shared files + docker-root: a1-sdnc-vth + +- project: + <<: *it_otf_common + name: it-otf-a1-policy-manager-vth + # start in parent directory with shared files + docker-root: a1-policy-manager-vth + +- project: name: it-otf-release + project: it/otf + # jenkins job name prefix + project-name: it-otf + # source of docker tag + container-tag-method: yaml-file + # maven settings file has docker credentials + mvn-settings: it-otf-settings branch: master # maven release requires sigul which requires centos # container release requires docker -- 2.16.6