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=refs%2Fheads%2Fmaster;hp=16c15e7c05f9e732a8d326879ae0ad2aa02a4762;hpb=be959966c97a9d7317bacb4171ef50171cdb6109;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 16c15e7c..65bc066e 100644
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -5,16 +5,8 @@
     views:
       - project-view
 
-- project:
-    name: sim-o1-interface-info
-    project: sim/o1-interface
-    project-name: sim-o1-interface
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- sim_o1_interface_docker: &sim_o1_interface_docker
-    # values apply to all sim/o1-interface docker projects
+- _sim_o1_interface_docker:
+    &sim_o1_interface_docker # values apply to all sim/o1-interface docker projects
     name: sim-o1-interface-common
     # git repo
     project: sim/o1-interface
@@ -24,77 +16,129 @@
     mvn-settings: sim-o1-interface-settings
     # source of docker tag
     container-tag-method: yaml-file
-    docker-root: ntsimulator
+    # 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'
+      - "{project-name}-gerrit-docker-jobs"
     stream:
       - master:
           branch: master
 
 - project:
     <<: *sim_o1_interface_docker
-    name: sim-o1-interface-ntsim-manager
+    name: sim-o1-interface-ntsim-ng-base
+    # jenkins job name prefix
+    project-name: "{name}"
+    # image 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
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "ntsimulator/ntsim-ng/.*"
+      - compare-type: REG_EXP
+        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 Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+    docker-root: ntsimulator/deploy/nts-manager
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "ntsimulator/deploy/nts-manager/.*"
+
+- project:
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-ntsim-ng-o-ran-fh
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/ntsim-manager'
+    docker-name: " o-ran-sc/nts-ng-o-ran-fh"
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/nts-manager/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: ntsimulator/deploy/nts-manager
+    docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+    docker-root: ntsimulator/deploy/o-ran
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/nts-manager/.*'
+        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 Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+    docker-root: ntsimulator/deploy/x-ran
+    gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/src/ntsimulator-manager/.*'
+        pattern: "ntsimulator/deploy/x-ran/.*"
+
+- project:
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-ntsim-ng-o-ran-ru-fh
+    # jenkins job name prefix
+    project-name: "{name}"
+    # image name
+    docker-name: " o-ran-sc/nts-ng-o-ran-ru-fh"
+    # dockerfile is in subdir
+    docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+    docker-root: ntsimulator/deploy/o-ran-ru-fh
+    gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/yang/nts-manager/.*'
+        pattern: "ntsimulator/deploy/o-ran-ru-fh/.*"
 
 - project:
     <<: *sim_o1_interface_docker
-    name: sim-o1-interface-o-ran-ru-fh
+    name: sim-o1-interface-ntsim-ng-o-ran-du
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/ntsim-o-ran-ru-fh'
+    docker-name: " o-ran-sc/nts-ng-o-ran-du"
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/o-ran/ru-fh/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: ntsimulator/deploy/o-ran/ru-fh
+    docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+    docker-root: ntsimulator/deploy/o-ran-du
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/.*'
+        pattern: "ntsimulator/deploy/o-ran-du/.*"
 
 - project:
     <<: *sim_o1_interface_docker
-    name: sim-o1-interface-o-ran-ru
+    name: sim-o1-interface-ntsim-ng-blank
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/ntsim-o-ran-ru'
+    docker-name: " o-ran-sc/nts-ng-blank"
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/o-ran-sc/o-ran-ru/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: ntsimulator/deploy/o-ran-sc/o-ran-ru
+    docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+    docker-root: ntsimulator/deploy/blank
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/.*'
+        pattern: "ntsimulator/deploy/blank/.*"
 
 - project:
     <<: *sim_o1_interface_docker
-    name: sim-o1-interface-x-ran
+    name: sim-o1-interface-ntsim-ng-tapi-topology
     # jenkins job name prefix
-    project-name: '{name}'
+    project-name: "{name}"
     # image name
-    docker-name: 'o-ran-sc/ntsim-x-ran'
+    docker-name: " o-ran-sc/smo-nts-ng-topology-server"
     # dockerfile is in subdir
-    docker-build-args: '--network=host -f deploy/x-ran/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: ntsimulator/deploy/x-ran
+    docker-build-args: "--network=host -f Dockerfile --build-arg NTS_BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+    docker-root: ntsimulator/deploy/smo-nts-ng-topology-server
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/.*'
+        pattern: "ntsimulator/deploy/smo-nts-ng-topology-server/.*"
 
 - project:
     <<: *sim_o1_interface_docker
@@ -103,4 +147,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - "{project-name}-gerrit-release-jobs"