Merge "Add trigger event on package verification and merge jobs for it/dep repo"

diff --git a/jjb/it-dev/it-dev-docker.yaml b/jjb/it-dev/it-dev-docker.yaml
index 08701b4..c58b7ac 100644 (file)
--- a/jjb/it-dev/it-dev-docker.yaml
+++ b/jjb/it-dev/it-dev-docker.yaml
@@ -15,15 +15,15 @@
     # get tag from YAML
     container-tag-method: yaml-file
     # Jenkins job prefix
-    project-name: 'it-dev-{img}'
+    project-name: 'it-dev-{name}'
     # Docker image name
-    docker-name: '{img}'
+    docker-name: '{name}'
     # Directory with Dockerfile
-    docker-root: 'bldr-imgs/{img}'
+    docker-root: 'bldr-imgs/{name}'
     # Limit build trigger to appropriate files;
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'bldr-imgs/{img}/.*'
+        pattern: 'bldr-imgs/{name}/.*'
     # Includes verify and merge jobs
     jobs:
       - '{project-name}-gerrit-docker-jobs'
@@ -32,21 +32,21 @@
       - master:
           branch: master
 
-# Each project name is a subdirectory in bldr-images
+# Each project name is a directory in o-ran-sc/it-dev/bldr-imgs
 # with a Dockerfile and a container-tag.yaml file
-# TODO: coalesce name+img after removing projects from ci-management
 
 - project:
-    name: it-dev-alpine3
-    img: bldr-alpine3
+    name: bldr-alpine3
     <<: *it_dev_docker_common
 
 - project:
-    name: it-dev-alpine3-go
-    img: bldr-alpine3-go
+    name: bldr-alpine3-go
     <<: *it_dev_docker_common
 
 - project:
-    name: it-dev-ubuntu18-c-go
-    img: bldr-ubuntu18-c-go
+    name: bldr-alpine3-rmr
+    <<: *it_dev_docker_common
+
+- project:
+    name: bldr-ubuntu18-c-go
     <<: *it_dev_docker_common

diff --git a/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml b/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
deleted file mode 100644 (file)
index 0c16fae..0000000
--- a/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
----
-- project:
-    name: scp-ocu-openlte-project-view
-    project-name: scp-ocu-openlte
-    views:
-      - project-view
-
-- project:
-    name: scp-ocu-openlte-info
-    project: scp/ocu/openlte
-    project-name: scp-ocu-openlte
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- scp_ocu_openlte_common: &scp_ocu_openlte_common
-    # values apply to all scp/ocu/openlte docker projects
-    name: scp-ocu-openlte-common
-    # git repo
-    project: scp/ocu/openlte
-    # jenkins job name prefix
-    project-name: scp-ocu-openlte
-    # maven settings file has docker credentials
-    mvn-settings: scp-ocu-openlte-settings
-    # source of docker tag
-    container-tag-method: yaml-file
-
-- project:
-    <<: *scp_ocu_openlte_common
-    name: scp-ocu-openlte
-    # image name
-    docker-name: 'o-ran-sc/scp/ocu-openlte'
-    docker-build-args: '--network=host'
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
-
-- project:
-    <<: *scp_ocu_openlte_common
-    name: scp-ocu-openlte-release
-    branch: master
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
-    jobs:
-      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/sim-e2-interface/sim-e2-interface.yaml b/jjb/sim-e2-interface/sim-e2-interface.yaml
index a6d2ed4..6307700 100644 (file)
--- a/jjb/sim-e2-interface/sim-e2-interface.yaml
+++ b/jjb/sim-e2-interface/sim-e2-interface.yaml
@@ -1,4 +1,10 @@
 ---
+- project:
+    name: sim-e2-interface-project-view
+    project-name: sim-e2-interface
+    views:
+      - project-view
+
 - project:
     name: sim-e2-interface-info
     project: sim/e2-interface
@@ -6,3 +12,38 @@
     build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
+
+- sim_e2_interface_docker: &sim_e2_interface_docker
+    # values apply to all sim/e2-interface docker projects
+    name: sim-e2-interface-docker
+    # git repo
+    project: sim/e2-interface
+    # jenkins job name prefix
+    project-name: sim-e2-interface
+    # maven settings file has docker credentials
+    mvn-settings: sim-e2-interface-settings
+    # source of docker tag
+    container-tag-method: yaml-file
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *sim_e2_interface_docker
+    name: sim-e2-interface-e2sim
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: 'o-ran-sc/ntsim-e2-simulator'
+    # docker root
+    docker-root: e2sim
+    # dockerfile is in subdir
+    docker-build-args: '--network=host -f docker/Dockerfile'
+    # tag file is in subdir
+    container-tag-yaml-dir: e2sim/docker
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '{docker-root}/.*'