From: Anil Belur Date: Thu, 19 May 2022 06:52:40 +0000 (+0000) Subject: Merge "Check in JJB file for smo-o2 project" X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=2e4391c5daec44cfb856a988c13190702cb90a9f;hp=ad7a9c7b1f2ae35940427f0d0618bba1e13b622f;p=ci-management.git Merge "Check in JJB file for smo-o2 project" --- diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml index b975451d..2381528f 100644 --- a/jjb/it-test/it-test.yaml +++ b/jjb/it-test/it-test.yaml @@ -76,15 +76,15 @@ # image name docker-name: 'o-ran-sc/{name}' # start in parent directory with shared files - docker-root: ric_benchmarking + docker-root: ric_benchmarking/e2-interface/e2sim/e2sm_examples/kpm_e2sm # dockerfile is in subdir of docker root - docker-build-args: '--network=host -f e2-interface/e2sim/e2sm_examples/kpm_e2sm/Dockerfile e2-interface/e2sim/e2sm_examples/kpm_e2sm' + docker-build-args: '--network=host -f ric_benchmarking/e2-interface/e2sim/e2sm_examples/kpm_e2sm/Dockerfile' # tag file is in subdir container-tag-yaml-dir: ric_benchmarking/e2-interface/e2sim/docker # build only on relevant changes gerrit_trigger_file_paths: - compare-type: REG_EXP - pattern: '{docker-root}/.*' + pattern: 'ric_benchmarking/e2-interface/.*' - project: <<: *it_test_common diff --git a/jjb/smo-ves/smo-ves.yaml b/jjb/smo-ves/smo-ves.yaml index 12d221e7..137760a8 100644 --- a/jjb/smo-ves/smo-ves.yaml +++ b/jjb/smo-ves/smo-ves.yaml @@ -70,6 +70,21 @@ stream: - master: branch: master +- project: + <<: *ves_docker_common + name: smo-postconfig + project-name: '{name}' + # image name + docker-name: 'smo-post-config' + # Dockerfile is in a subdir + docker-root: postconfig + # source of docker tag + container-tag-method: yaml-file + jobs: + - '{project-name}-gerrit-docker-jobs' + stream: + - master: + branch: master - project: <<: *ves_docker_common @@ -116,7 +131,7 @@ sonar.projectName={project-name} sonar.organization={sonarcloud_project_organization} sonar.build.sourceEncoding=UTF-8 - sonar.sources=a1 + sonar.sources=collector sonar.python.coverage.reportPaths=coverage.xml - jobs: - - gerrit-tox-sonarqube + jobs: + - gerrit-tox-sonarqube