Merge "pylog_pypi project was incorrectly terminated in jjb template"

diff --git a/global-jjb b/global-jjb
index 142b469..168bf7c 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 142b4697db846df8f294427b52533c2e797b9610
+Subproject commit 168bf7cebd8b6619449eaa9e7f150fc95b85c873

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
index 0b921ed..0106382 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
@@ -1,4 +1,4 @@
-LABELS=centos7-builder-1c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039
-VOLUME_SIZE=20
+LABELS=centos7-builder-1c-1g
 HARDWARE_ID=v2-highcpu-1
+VOLUME_SIZE=20

diff --git a/jjb/ric-app-hw-go/ric-app-hw-go.yaml b/jjb/ric-app-hw-go/ric-app-hw-go.yaml
new file mode 100644 (file)
index 0000000..37386ff
--- /dev/null
+++ b/jjb/ric-app-hw-go/ric-app-hw-go.yaml
@@ -0,0 +1,24 @@
+---
+- project:
+    name: ric-app-hw-go-project-view
+    project-name: ric-app-hw-go
+    views:
+      - project-view
+
+- hw-go_common: &hw-go_common
+    # values apply to all projects
+    name: hw-go-common
+    # git repo
+    project: ric-app/hw-go
+    # jenkins prefix
+    project-name: ric-app-hw-go
+    # maven settings file has docker credentials
+    mvn-settings: ric-app-hw-go-settings
+
+# verify INFO.yaml changes
+- project:
+    <<: *hw-go_common
+    name: ric-app-hw-go-info
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/ric-app-hw-python/ric-app-hw-python.yaml b/jjb/ric-app-hw-python/ric-app-hw-python.yaml
new file mode 100644 (file)
index 0000000..67549cf
--- /dev/null
+++ b/jjb/ric-app-hw-python/ric-app-hw-python.yaml
@@ -0,0 +1,24 @@
+---
+- project:
+    name: ric-app-hw-python-project-view
+    project-name: ric-app-hw-python
+    views:
+      - project-view
+
+- hw-python_common: &hw-python_common
+    # values apply to all projects
+    name: hw-python-common
+    # git repo
+    project: ric-app/hw-python
+    # jenkins prefix
+    project-name: ric-app-hw-python
+    # maven settings file has docker credentials
+    mvn-settings: ric-app-hw-python-settings
+
+# verify INFO.yaml changes
+- project:
+    <<: *hw-python_common
+    name: ric-app-hw-python-info
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml
index 16c15e7..41fb199 100644 (file)
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -24,6 +24,7 @@
     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
     docker-root: ntsimulator
     build-node: ubuntu1804-docker-4c-4g
     jobs:
@@ -34,67 +35,59 @@
 
 - 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/ntsim-manager'
+    docker-name: 'o-ran-sc/nts-ng-base'
     # 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 deploy/base/ubuntu.Dockerfile'
+    # tag file latest, since it is base for others
+    container-tag-method: latest
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/deploy/nts-manager/.*'
-      - compare-type: REG_EXP
-        pattern: 'ntsimulator/src/ntsimulator-manager/.*'
+        pattern: 'ntsimulator/ntsim-ng/.*'
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/yang/nts-manager/.*'
+        pattern: 'ntsimulator/deploy/base/.*'
 
 - project:
     <<: *sim_o1_interface_docker
-    name: sim-o1-interface-o-ran-ru-fh
+    name: sim-o1-interface-ntsim-ng-manager
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/ntsim-o-ran-ru-fh'
+    docker-name: 'o-ran-sc/ntsim-ng-manager'
     # 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 deploy/nts-manager/ubuntu.Dockerfile'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/.*'
+        pattern: 'ntsimulator/deploy/nts-manager/.*'
 
 - project:
     <<: *sim_o1_interface_docker
-    name: sim-o1-interface-o-ran-ru
+    name: sim-o1-interface-ntsim-ng-o-ran-fh
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/ntsim-o-ran-ru'
+    docker-name: ' o-ran-sc/nts-ng-o-ran-fh'
     # 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 deploy/o-ran/ubuntu.Dockerfile'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/.*'
+        pattern: 'ntsimulator/deploy/o-ran/.*'
 
 - project:
     <<: *sim_o1_interface_docker
-    name: sim-o1-interface-x-ran
+    name: sim-o1-interface-ntsim-ng-x-ran
     # jenkins job name prefix
     project-name: '{name}'
     # image name
-    docker-name: 'o-ran-sc/ntsim-x-ran'
+    docker-name: 'o-ran-sc/nts-ng-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
+    docker-build-args: '--network=host -f deploy/x-ran/ubuntu.Dockerfile'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'ntsimulator/.*'
+        pattern: 'ntsimulator/deploy/x-ran/.*'
 
 - project:
     <<: *sim_o1_interface_docker