From 732346bc3975de2d1e04d4c6041fef5328e0e88f Mon Sep 17 00:00:00 2001
From: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
Date: Thu, 2 Apr 2020 18:22:57 +0300
Subject: [PATCH] Align CI/CD jobs with code refactoring.

Align the CI/CD jobs for the sim/o1-interface project, which has gone through a folder and code refactoring.

The new docker jobs were tested in the Sandbox Jenkins. The verify works fine, the merge jobs are failing because of: unauthorized: access to the requested resource is not authorized

Issue-ID: SIM-19
Change-Id: Ib783ace591499cc1c765a896388aa69cc0357c39
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
---
 jjb/sim-o1-interface/sim-o1-interface.yaml | 81 +++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 28 deletions(-)

diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml
index e8c9c0f8..0885b29d 100644
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -13,7 +13,7 @@
     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,55 +24,80 @@
     mvn-settings: sim-o1-interface-settings
     # source of docker tag
     container-tag-method: yaml-file
+    docker-root: ntsimulator
+    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-manager
     # 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/manager/Dockerfile'
+    docker-name: 'o-ran-sc/ntsim-manager'
+    # 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/manager
+    container-tag-yaml-dir: ntsimulator/deploy/nts-manager
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/manager/.*'
+        pattern: 'ntsimulator/deploy/nts-manager/.*'
       - compare-type: REG_EXP
         pattern: 'ntsimulator/src/ntsimulator-manager/.*'
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/yang/manager/.*'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
+        pattern: 'ntsimulator/yang/nts-manager/.*'
 
 - project:
-    <<: *sim_o1_interface_common
-    name: sim-o1-interface-device
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-o-ran-ru-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'
+    docker-name: 'o-ran-sc/ntsim-o-ran-ru-fh'
+    # 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
+    container-tag-yaml-dir: ntsimulator/deploy/o-ran/ru-fh
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'ntsimulator/.*'
+
+- project:
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-o-ran-ru
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/ntsim-o-ran-ru'
+    # 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
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'ntsimulator/.*'
+
+- project:
+    <<: *sim_o1_interface_docker
+    name: sim-o1-interface-x-ran
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/ntsim-x-ran'
+    # 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
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'ntsimulator/.*'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
 
 - project:
-    <<: *sim_o1_interface_common
+    <<: *sim_o1_interface_docker
     name: sim-o1-interface-release
     branch: master
     # maven release requires sigul which requires centos
-- 
2.16.6