X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fsim-o1-interface%2Fsim-o1-interface.yaml;h=42bc3bfffb805f311deddf428d74dab8fabecf63;hb=a7f9c4ab7d03930ad4445c1792ea1a9d2302035e;hp=cc95d209f873258c9e52bcc62e9af3e1536c8fd1;hpb=600f3036329aca2431705cacf064c10f6d325003;p=ci-management.git

diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml
index cc95d209..42bc3bff 100644
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -9,11 +9,11 @@
     name: sim-o1-interface-info
     project: sim/o1-interface
     project-name: sim-o1-interface
-    branch: master
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
 
-- sim_o1_interface_common: &sim_o1_interface_common
+- sim_o1_interface_docker: &sim_o1_interface_docker
     # values apply to all sim/o1-interface docker projects
     name: sim-o1-interface-common
     # git repo
@@ -24,57 +24,77 @@
     mvn-settings: sim-o1-interface-settings
     # 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
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
 
 - project:
-    <<: *sim_o1_interface_common
-    name: sim-o1-interface-manager
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-ntsim-ng-base
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/{name}'
+    docker-name: 'o-ran-sc/nts-ng-base'
+    # dockerfile is in subdir
+    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
-    # dockerfile is in subdir; needed because Dockerfile includes files outside of build context
-    docker-build-args: '--network=host -f deploy/manager/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: ntsimulator/deploy/manager
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/manager/.*'
+        pattern: 'ntsimulator/ntsim-ng/.*'
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/src/ntsimulator-manager/.*'
+        pattern: 'ntsimulator/deploy/base/.*'
+
+- project:
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-ntsim-ng-manager
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/ntsim-ng-manager'
+    # dockerfile is in subdir
+    docker-build-args: '--network=host -f ubuntu.Dockerfile'
+    docker-root: ntsimulator/deploy/nts-manager
+    gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/yang/manager/.*'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
+        pattern: 'ntsimulator/deploy/nts-manager/.*'
 
 - project:
-    <<: *sim_o1_interface_common
-    name: sim-o1-interface-device
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-ntsim-ng-o-ran-fh
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/{name}'
-    docker-root: ntsimulator
-    # dockerfile is in subdir; needed because Dockerfile includes files outside of build context
-    docker-build-args: '--network=host -f deploy/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: ntsimulator/deploy
+    docker-name: ' o-ran-sc/nts-ng-o-ran-fh'
+    # dockerfile is in subdir
+    docker-build-args: '--network=host -f ubuntu.Dockerfile'
+    docker-root: ntsimulator/deploy/o-ran
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/.*'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
+        pattern: 'ntsimulator/deploy/o-ran/.*'
+
+- project:
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-ntsim-ng-x-ran
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/nts-ng-x-ran'
+    # dockerfile is in subdir
+    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/.*'
 
 - project:
-    <<: *sim_o1_interface_common
+    <<: *sim_o1_interface_docker
     name: sim-o1-interface-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g