X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fit-test%2Fit-test.yaml;h=17c4854b9c964a38a88883fb0e547c065ec3794b;hb=a87cf63f53eb5e3b92232bf2619594211ab39d0b;hp=4089b63856913ac3fae354d9950f6ffd5c1cc740;hpb=8c8d7175629e97ba2c88720a6c7f6b4050044331;p=ci-management.git

diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml
index 4089b638..17c4854b 100644
--- a/jjb/it-test/it-test.yaml
+++ b/jjb/it-test/it-test.yaml
@@ -13,52 +13,85 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- it_test_common: &it_test_common
-    # values apply to all RIC docker-build projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
+- _it_test_common: &it_test_common # values apply to all it/test docker projects
     name: it-test-docker-common
-    build-node: ubuntu1804-docker-4c-4g
-    # pull from the public mirror + releases registry
-    container-public-registry: nexus3.o-ran-sc.org:10001
-    # push to the staging repo bcos all builds are RCs
-    container-push-registry: nexus3.o-ran-sc.org:10004
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host'
+    # git repo
+    project: it/test
+    # jenkins job name prefix
+    project-name: it-test
     # source of docker tag
     container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: "--network=host"
+    # maven settings file has docker credentials
+    mvn-settings: it-test-settings
+    jobs:
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 
 - project:
+    <<: *it_test_common
     name: it-test-nanobot
-    # git repo
-    project: it/test
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: '{name}'
-    # subdirectory
-    docker-root: 'ric_robot_suite/docker/nanobot'
-    # maven settings file has docker credentials
-    mvn-settings: it-test-settings
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    <<: *it_test_common
+    docker-name: "o-ran-sc/{name}"
+    # start in parent directory with shared files
+    docker-root: ric_robot_suite
+    # dockerfile is in subdir of docker root
+    docker-build-args: "--network=host -f docker/nanobot/Dockerfile"
+    # tag file is in subdir
+    container-tag-yaml-dir: ric_robot_suite/docker/nanobot
+    # build only on relevant changes
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "{docker-root}/.*"
 
 - project:
+    <<: *it_test_common
     name: it-test-ric-robot
-    # git repo
-    project: it/test
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: '{name}'
-    # subdirectory
-    docker-root: 'ric_robot_suite/docker/ric-robot'
-    # maven settings file has docker credentials
-    mvn-settings: it-test-settings
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
+    docker-name: "o-ran-sc/{name}"
+    # start in parent directory with shared files
+    docker-root: ric_robot_suite
+    # dockerfile is in subdir of docker root
+    docker-build-args: "--network=host -f docker/ric-robot/Dockerfile"
+    # tag file is in subdir
+    container-tag-yaml-dir: ric_robot_suite/docker/ric-robot
+    # build only on relevant changes
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "{docker-root}/.*"
+
+- project:
     <<: *it_test_common
+    name: it-test-ric-benchmarking
+    # jenkins job name prefix
+    project-name: "{name}"
+    # image name
+    docker-name: "o-ran-sc/{name}"
+    # start in parent directory with shared files
+    docker-root: ric_benchmarking/e2-interface/e2sim/e2sm_examples/kpm_e2sm
+    # dockerfile is in subdir of docker root
+    docker-build-args: "--network=host -f 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: "ric_benchmarking/e2-interface/.*"
+      - compare-type: REG_EXP
+        pattern: "test_scripts/O2IMS_Compliance_Test/.*"
+
+- project:
+    <<: *it_test_common
+    name: it-test-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - "{project-name}-gerrit-release-jobs"