Merge "Upgrade go in Ubuntu 18 docker base image"

diff --git a/docker/bldr-alpine3-go/Dockerfile b/docker/bldr-alpine3-go/Dockerfile
new file mode 100644 (file)
index 0000000..a1e31f0
--- /dev/null
+++ b/docker/bldr-alpine3-go/Dockerfile
@@ -0,0 +1,33 @@
+# ==================================================================================
+#       Copyright (c) 2020 Nokia
+#       Copyright (c) 2020 AT&T Intellectual Property.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+# ==================================================================================
+
+# Has:
+# golang 1.13.7
+# alpine 3.11
+# rmr 1.13.1
+# Installing this version of rmr also pulls in nng
+
+# install a well known working rmr
+FROM golang:1.13.7-alpine3.11
+RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git
+RUN git clone --branch 1.13.1 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
+    && cd rmr \
+    && mkdir .build; cd .build \
+    && echo "<<<installing rmr devel headers>>>" \
+    && cmake .. -DDEV_PKG=1; make install \
+    && echo "<<< installing rmr .so>>>" \
+    && cmake .. -DPACK_EXTERNALS=1; make install

diff --git a/docker/bldr-alpine3-go/container-tag.yaml b/docker/bldr-alpine3-go/container-tag.yaml
new file mode 100644 (file)
index 0000000..ef8d069
--- /dev/null
+++ b/docker/bldr-alpine3-go/container-tag.yaml
@@ -0,0 +1,2 @@
+---
+tag: 1-rmr1.13.1

diff --git a/docker/bldr-debian-python/Dockerfile b/docker/bldr-debian-python/Dockerfile
deleted file mode 100644 (file)
index 1d9a23b..0000000
--- a/docker/bldr-debian-python/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-# O-RAN-SC
-#
-# Copyright (C) 2019 AT&T Intellectual Property and Nokia
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Builder image with CI tools for RIC components
-# uses Python 3.7 (Debian stretch) base which has
-# C and C++ tools from buildpack-deps:stretch then adds:
-# Ninja 1.9 from binary distro to /usr/local/bin
-# Nanomsg Next Gen libs by cloning and building
-
-FROM python:3.7
-
-RUN apt-get update && apt-get -q -y install \
-  autoconf \
-  autoconf-archive \
-  automake \
-  cmake \
-  libtool \
-  pkg-config
-
-RUN wget -nv https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip \
-    && unzip ninja-linux.zip \
-    && chmod +x ninja \
-    && mv ninja /usr/local/bin
-
-# NNG repo is not frequently tagged so it's pinned to a commit hash.
-# This commit provides fix to the proxy-reconnect
-# bug that we identified:  https://github.com/nanomsg/nng/issues/970
-RUN git clone https://github.com/nanomsg/nng.git \
-    && cd nng \
-    && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \
-    && mkdir build \
-    && cd build \
-    && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
-    && ninja \
-    && ninja install

diff --git a/docker/bldr-debian-python/container-tag.yaml b/docker/bldr-debian-python/container-tag.yaml
deleted file mode 100755 (executable)
index 2862542..0000000
--- a/docker/bldr-debian-python/container-tag.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-# Not feasible to show all the software versions
-# here so just use a counter plus the base image
----
-tag: 4-py3.7-nng

diff --git a/global-jjb b/global-jjb
index 1fb55e8..2bd69d4 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 1fb55e807d49e36b27d94d0c411c6907d2216068
+Subproject commit 2bd69d4b9fb016a8377ef4da0730323271745d06

diff --git a/jjb/aal-lib/aal-lib.yaml b/jjb/aal-lib/aal-lib.yaml
new file mode 100644 (file)
index 0000000..5779700
--- /dev/null
+++ b/jjb/aal-lib/aal-lib.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: aal-lib-info
+    project: aal/lib
+    project-name: aal-lib
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/aal-logic/aal-logic.yaml b/jjb/aal-logic/aal-logic.yaml
new file mode 100644 (file)
index 0000000..8c2aab9
--- /dev/null
+++ b/jjb/aal-logic/aal-logic.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: aal-logic-info
+    project: aal/logic
+    project-name: aal-logic
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/aal-mgmt/aal-mgmt.yaml b/jjb/aal-mgmt/aal-mgmt.yaml
new file mode 100644 (file)
index 0000000..7410eb9
--- /dev/null
+++ b/jjb/aal-mgmt/aal-mgmt.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: aal-mgmt-info
+    project: aal/mgmt
+    project-name: aal-mgmt
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/aal-virt/aal-virt.yaml b/jjb/aal-virt/aal-virt.yaml
new file mode 100644 (file)
index 0000000..0575a95
--- /dev/null
+++ b/jjb/aal-virt/aal-virt.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: aal-virt-info
+    project: aal/virt
+    project-name: aal-virt
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index 0bf7626..1c2274d 100644 (file)
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -1,6 +1,8 @@
 ---
+# Job configurations for base docker build images
+
+# This macro factors out common configuration
 - ci_docker_common: &ci_docker_common
-    # Defines common ci-docker configuration
     name: ci-docker-common
     # git repo
     project: ci-management
@@ -10,52 +12,42 @@
     cron: 'H H * * 6'
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
-    # default to YAML
+    # get tag from YAML
     container-tag-method: yaml-file
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
-
-- project:
-    <<: *ci_docker_common
-    name: bldr-alpine3
+    # name key is overridden by project template
+    # Jenkins job prefix
     project-name: '{project}-{name}'
+    # Docker image name
     docker-name: '{name}'
+    # Directory with Dockerfile
     docker-root: 'docker/{name}'
+    # Limit build trigger to appropriate files
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'docker/{name}/.*'
+    # Includes verify and merge jobs
     jobs:
       - '{project-name}-gerrit-docker-jobs'
+    # Only build master branch
+    stream:
+      - master:
+          branch: master
+
+# Each project name is a subdirectory in ci-management/docker
+# with a Dockerfile and a container-tag.yaml file
 
 - project:
+    name: bldr-alpine3
     <<: *ci_docker_common
-    name: bldr-debian-python
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
 
 - project:
+    name: bldr-alpine3-go
     <<: *ci_docker_common
-    name: bldr-ubuntu16-c-go
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
 
 - project:
+    name: bldr-ubuntu16-c-go
     <<: *ci_docker_common
+
+- project:
     name: bldr-ubuntu18-c-go
-    project-name: '{project}-{name}'
-    docker-name: '{name}'
-    docker-root: 'docker/{name}'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'docker/{name}/.*'
+    <<: *ci_docker_common

diff --git a/jjb/com-sctp/com-sctp.yaml b/jjb/com-sctp/com-sctp.yaml
new file mode 100644 (file)
index 0000000..4a9368b
--- /dev/null
+++ b/jjb/com-sctp/com-sctp.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: com-sctp-info
+    project: com/sctp
+    project-name: com-sctp
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/gnb-int-build/gnb-int-build.yaml b/jjb/gnb-int-build/gnb-int-build.yaml
new file mode 100644 (file)
index 0000000..5347e73
--- /dev/null
+++ b/jjb/gnb-int-build/gnb-int-build.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: gnb-int-build-info
+    project: gnb-int/build
+    project-name: gnb-int-build
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/gnb-int-common/gnb-int-common.yaml b/jjb/gnb-int-common/gnb-int-common.yaml
new file mode 100644 (file)
index 0000000..4e02da7
--- /dev/null
+++ b/jjb/gnb-int-common/gnb-int-common.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: gnb-int-common-info
+    project: gnb-int/common
+    project-name: gnb-int-common
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/gnb-int-src/gnb-int-src.yaml b/jjb/gnb-int-src/gnb-int-src.yaml
new file mode 100644 (file)
index 0000000..c6f6d34
--- /dev/null
+++ b/jjb/gnb-int-src/gnb-int-src.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: gnb-int-src-info
+    project: gnb-int/src
+    project-name: gnb-int-src
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/it-dep/it-dep.yaml b/jjb/it-dep/it-dep.yaml
index fd3f3ec..076c30b 100644 (file)
--- a/jjb/it-dep/it-dep.yaml
+++ b/jjb/it-dep/it-dep.yaml
@@ -73,7 +73,7 @@
     # image name
     docker-name: 'o-ran-sc/{name}'
     # root of docker build
-    docker-root: ric-infra/45-Tiller/docker
+    docker-root: ci/tiller-secret-gen
     # build only on relevant changes
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP

diff --git a/jjb/it-dev/it-dev.yaml b/jjb/it-dev/it-dev.yaml
new file mode 100644 (file)
index 0000000..8831df5
--- /dev/null
+++ b/jjb/it-dev/it-dev.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: it-dev-info
+    project: it/dev
+    project-name: it-dev
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/it-int/it-int.yaml b/jjb/it-int/it-int.yaml
new file mode 100644 (file)
index 0000000..9efe70a
--- /dev/null
+++ b/jjb/it-int/it-int.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: it-int-info
+    project: it/int
+    project-name: it-int
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 443e4d0..f57ffbc 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -9,7 +9,7 @@
     name: nonrtric-info
     project: nonrtric
     project-name: nonrtric
-    branch: master
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
 
@@ -46,3 +46,15 @@
     build-node: centos7-docker-2c-8g
     jobs:
       - '{project-name}-gerrit-release-jobs'
+
+- project:
+    <<: *nonrtric_jdk11
+    name: nonrtric-sonar
+    # template goal install builds docker image unnecessarily
+    mvn-params: -Ddocker.skip=true
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar

diff --git a/jjb/o-cu-e2/o-cu-e2.yaml b/jjb/o-cu-e2/o-cu-e2.yaml
new file mode 100644 (file)
index 0000000..ce0e630
--- /dev/null
+++ b/jjb/o-cu-e2/o-cu-e2.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: o-cu-e2-info
+    project: o-cu/e2
+    project-name: o-cu-e2
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/o-cu-sim/o-cu-sim.yaml b/jjb/o-cu-sim/o-cu-sim.yaml
new file mode 100644 (file)
index 0000000..204e1cf
--- /dev/null
+++ b/jjb/o-cu-sim/o-cu-sim.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: o-cu-sim-info
+    project: o-cu/sim
+    project-name: o-cu-sim
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/o-du-l2/o-du-l2.yaml b/jjb/o-du-l2/o-du-l2.yaml
index 949b3b6..b112486 100644 (file)
--- a/jjb/o-du-l2/o-du-l2.yaml
+++ b/jjb/o-du-l2/o-du-l2.yaml
@@ -9,7 +9,7 @@
     name: o-du-l2-info
     project: o-du/l2
     project-name: o-du-l2
-    branch: master
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
 

diff --git a/jjb/o-du-sim/o-du-sim.yaml b/jjb/o-du-sim/o-du-sim.yaml
new file mode 100644 (file)
index 0000000..0dde022
--- /dev/null
+++ b/jjb/o-du-sim/o-du-sim.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: o-du-sim-info
+    project: o-du/sim
+    project-name: o-du-sim
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/o-du/o-du.yaml b/jjb/o-du/o-du.yaml
new file mode 100644 (file)
index 0000000..088414c
--- /dev/null
+++ b/jjb/o-du/o-du.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: o-du-info
+    project: o-du
+    project-name: o-du
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/o-ran-sc.github.io/o-ran-sc.github.io.yaml b/jjb/o-ran-sc.github.io/o-ran-sc.github.io.yaml
new file mode 100644 (file)
index 0000000..526ff8b
--- /dev/null
+++ b/jjb/o-ran-sc.github.io/o-ran-sc.github.io.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: o-ran-sc.github.io-info
+    project: o-ran-sc.github.io
+    project-name: o-ran-sc.github.io
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/o-ru-sim/o-ru-sim b/jjb/o-ru-sim/o-ru-sim
new file mode 100644 (file)
index 0000000..1cd0fc6
--- /dev/null
+++ b/jjb/o-ru-sim/o-ru-sim
@@ -0,0 +1,8 @@
+---
+- project:
+    name: o-ru-sim-info
+    project: o-ru/sim
+    project-name: o-ru-sim
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/oam/oam.yaml b/jjb/oam/oam.yaml
index 586eabb..5f2e337 100644 (file)
--- a/jjb/oam/oam.yaml
+++ b/jjb/oam/oam.yaml
@@ -9,6 +9,6 @@
     name: oam-info
     project: oam
     project-name: oam
-    branch: master
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify

diff --git a/jjb/ric-nrt-a1/ric-nrt-a1.yaml b/jjb/ric-nrt-a1/ric-nrt-a1.yaml
new file mode 100644 (file)
index 0000000..3325432
--- /dev/null
+++ b/jjb/ric-nrt-a1/ric-nrt-a1.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-nrt-a1-info
+    project: ric-nrt/a1
+    project-name: ric-nrt-a1
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/ric-nrt-oam/ric-nrt-oam.yaml b/jjb/ric-nrt-oam/ric-nrt-oam.yaml
new file mode 100644 (file)
index 0000000..c345276
--- /dev/null
+++ b/jjb/ric-nrt-oam/ric-nrt-oam.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-nrt-oam-info
+    project: ric-nrt/oam
+    project-name: ric-nrt-oam
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/ric-plt-asn1/ric-plt-asn1-documents.yaml b/jjb/ric-plt-asn1-documents/ric-plt-asn1-documents.yaml
similarity index 100%
rename from jjb/ric-plt-asn1/ric-plt-asn1-documents.yaml
rename to jjb/ric-plt-asn1-documents/ric-plt-asn1-documents.yaml

diff --git a/jjb/ric-plt/dbaas/hiredis-vip/info-ric-plt-dbaas-hiredis-vip.yaml b/jjb/ric-plt-dbaas-hiredis-vip/ric-plt-dbaas-hiredis-vip.yaml
similarity index 82%
rename from jjb/ric-plt/dbaas/hiredis-vip/info-ric-plt-dbaas-hiredis-vip.yaml
rename to jjb/ric-plt-dbaas-hiredis-vip/ric-plt-dbaas-hiredis-vip.yaml
index ed9dd77..4d98812 100644 (file)
--- a/jjb/ric-plt/dbaas/hiredis-vip/info-ric-plt-dbaas-hiredis-vip.yaml
+++ b/jjb/ric-plt-dbaas-hiredis-vip/ric-plt-dbaas-hiredis-vip.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-dbaas-hiredis-vip-info
     project-name: ric-plt-dbaas-hiredis-vip
+    project: ric-plt/dbaas/hiredis-vip
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/dbaas/hiredis-vip
-    branch: master

diff --git a/jjb/ric-plt/demo1/info-ric-plt-demo1.yaml b/jjb/ric-plt-demo1/ric-plt-demo1.yaml
similarity index 79%
rename from jjb/ric-plt/demo1/info-ric-plt-demo1.yaml
rename to jjb/ric-plt-demo1/ric-plt-demo1.yaml
index b89f6f5..c822ab6 100644 (file)
--- a/jjb/ric-plt/demo1/info-ric-plt-demo1.yaml
+++ b/jjb/ric-plt-demo1/ric-plt-demo1.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-demo1-info
     project-name: ric-plt-demo1
+    project: ric-plt/demo1
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/demo1
-    branch: master

diff --git a/jjb/ric-plt/jaegeradapter/info-ric-plt-jaegeradapter.yaml b/jjb/ric-plt-jaegeradapter/ric-plt-jaegeradapter.yaml
similarity index 81%
rename from jjb/ric-plt/jaegeradapter/info-ric-plt-jaegeradapter.yaml
rename to jjb/ric-plt-jaegeradapter/ric-plt-jaegeradapter.yaml
index 2a9e681..3e4637e 100644 (file)
--- a/jjb/ric-plt/jaegeradapter/info-ric-plt-jaegeradapter.yaml
+++ b/jjb/ric-plt-jaegeradapter/ric-plt-jaegeradapter.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-jaegeradapter-info
     project-name: ric-plt-jaegeradapter
+    project: ric-plt/jaegeradapter
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/jaegeradapter
-    branch: master

diff --git a/jjb/ric-plt/nodeb-rnib/info-ric-plt-nodeb-rnib.yaml b/jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml
similarity index 80%
rename from jjb/ric-plt/nodeb-rnib/info-ric-plt-nodeb-rnib.yaml
rename to jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml
index 48d98ee..6555a89 100644 (file)
--- a/jjb/ric-plt/nodeb-rnib/info-ric-plt-nodeb-rnib.yaml
+++ b/jjb/ric-plt-nodeb-rnib/ric-plt-nodeb-rnib.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-nodeb-rnib-info
     project-name: ric-plt-nodeb-rnib
+    project: ric-plt/nodeb-rnib
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/nodeb-rnib
-    branch: master

diff --git a/jjb/ric-plt-o1/ric-plt-o1.yaml b/jjb/ric-plt-o1/ric-plt-o1.yaml
index f7671dd..4b6830c 100644 (file)
--- a/jjb/ric-plt-o1/ric-plt-o1.yaml
+++ b/jjb/ric-plt-o1/ric-plt-o1.yaml
@@ -9,6 +9,6 @@
     name: ric-plt-o1-info
     project: ric-plt/o1
     project-name: ric-plt-o1
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify

diff --git a/jjb/ric-plt/resource-status-processor/info-ric-plt-resource-status-processor.yaml b/jjb/ric-plt-resource-status-processor/ric-plt-resource-status-processor.yaml
similarity index 84%
rename from jjb/ric-plt/resource-status-processor/info-ric-plt-resource-status-processor.yaml
rename to jjb/ric-plt-resource-status-processor/ric-plt-resource-status-processor.yaml
index 6ac5f68..6468834 100644 (file)
--- a/jjb/ric-plt/resource-status-processor/info-ric-plt-resource-status-processor.yaml
+++ b/jjb/ric-plt-resource-status-processor/ric-plt-resource-status-processor.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-resource-status-processor-info
     project-name: ric-plt-resource-status-processor
+    project: ric-plt/resource-status-processor
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/resource-status-processor
-    branch: master

diff --git a/jjb/ric-plt/ric-dep/info-ric-plt-ric-dep.yaml b/jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml
similarity index 79%
rename from jjb/ric-plt/ric-dep/info-ric-plt-ric-dep.yaml
rename to jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml
index 24eae53..9dea7b3 100644 (file)
--- a/jjb/ric-plt/ric-dep/info-ric-plt-ric-dep.yaml
+++ b/jjb/ric-plt-ric-dep/ric-plt-ric-dep.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-ric-dep-info
     project-name: ric-plt-ric-dep
+    project: ric-plt/ric-dep
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/ric-dep
-    branch: master

diff --git a/jjb/ric-plt/ric-test/info-ric-plt-ric-test.yaml b/jjb/ric-plt-ric-test/ric-plt-ric-test.yaml
similarity index 80%
rename from jjb/ric-plt/ric-test/info-ric-plt-ric-test.yaml
rename to jjb/ric-plt-ric-test/ric-plt-ric-test.yaml
index a8b8814..c048347 100644 (file)
--- a/jjb/ric-plt/ric-test/info-ric-plt-ric-test.yaml
+++ b/jjb/ric-plt-ric-test/ric-plt-ric-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-ric-test-info
     project-name: ric-plt-ric-test
+    project: ric-plt/ric-test
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/ric-test
-    branch: master

diff --git a/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml b/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml
index 73bb213..c165935 100644 (file)
--- a/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml
+++ b/jjb/ric-plt-sdlpy/ric-plt-sdlpy.yaml
@@ -5,6 +5,14 @@
     views:
       - project-view
 
+- project:
+    name: ric-plt-sdlpy-info
+    project: ric-plt/sdlpy
+    project-name: ric-plt-sdlpy
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - sdlpy_common: &sdlpy_common
     name: sdlpy-common
     # git repo
@@ -16,13 +24,6 @@
     # release job requires centos
     build-node: centos7-builder-1c-1g
 
-# committer management
-- project:
-    name: ric-plt-sdlpy-info
-    <<: *sdlpy_common
-    jobs:
-      - gerrit-info-yaml-verify
-
 # verify distribution and publish to test.pypi.org
 - project:
     name: ric-plt-sdlpy-pypi

diff --git a/jjb/ric-plt/streaming-protobufs/info-ric-plt-streaming-protobufs.yaml b/jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml
similarity index 83%
rename from jjb/ric-plt/streaming-protobufs/info-ric-plt-streaming-protobufs.yaml
rename to jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml
index a809651..094d5ea 100644 (file)
--- a/jjb/ric-plt/streaming-protobufs/info-ric-plt-streaming-protobufs.yaml
+++ b/jjb/ric-plt-streaming-protobufs/ric-plt-streaming-protobufs.yaml
@@ -2,7 +2,7 @@
 - project:
     name: ric-plt-streaming-protobufs-info
     project-name: ric-plt-streaming-protobufs
+    project: ric-plt/streaming-protobufs
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
-    project: ric-plt/streaming-protobufs
-    branch: master

diff --git a/jjb/ric-plt/utils/info-ric-plt-utils.yaml b/jjb/ric-plt/utils/info-ric-plt-utils.yaml
deleted file mode 100644 (file)
index 9c61a86..0000000
--- a/jjb/ric-plt/utils/info-ric-plt-utils.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
-    name: ric-plt-utils-info
-    project-name: ric-plt-utils
-    jobs:
-      - gerrit-info-yaml-verify
-    project: ric-plt/utils
-    branch: master

diff --git a/jjb/scp-oam-modeling/scp-oam-modeling.yaml b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
new file mode 100644 (file)
index 0000000..c0efc34
--- /dev/null
+++ b/jjb/scp-oam-modeling/scp-oam-modeling.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: scp-oam-modeling-info
+    project: scp/oam/modeling
+    project-name: scp-oam-modeling
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml b/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
index e1dacc5..0c16fae 100644 (file)
--- a/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
+++ b/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
@@ -9,7 +9,7 @@
     name: scp-ocu-openlte-info
     project: scp/ocu/openlte
     project-name: scp-ocu-openlte
-    branch: master
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-info-yaml-verify
 

diff --git a/jjb/sim-a1-interface/sim-a1-interface.yaml b/jjb/sim-a1-interface/sim-a1-interface.yaml
new file mode 100644 (file)
index 0000000..b4e3dfd
--- /dev/null
+++ b/jjb/sim-a1-interface/sim-a1-interface.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: sim-a1-interface-info
+    project: sim/a1-interface
+    project-name: sim-a1-interface
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/sim-e1-interface/sim-e1-interface.yaml b/jjb/sim-e1-interface/sim-e1-interface.yaml
new file mode 100644 (file)
index 0000000..8b2d398
--- /dev/null
+++ b/jjb/sim-e1-interface/sim-e1-interface.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: sim-e1-interface-info
+    project: sim/e1-interface
+    project-name: sim-e1-interface
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/sim-e2-interface/sim-e2-interface.yaml b/jjb/sim-e2-interface/sim-e2-interface.yaml
new file mode 100644 (file)
index 0000000..a6d2ed4
--- /dev/null
+++ b/jjb/sim-e2-interface/sim-e2-interface.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: sim-e2-interface-info
+    project: sim/e2-interface
+    project-name: sim-e2-interface
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/sim-f1-interface/sim-f1-interface.yaml b/jjb/sim-f1-interface/sim-f1-interface.yaml
new file mode 100644 (file)
index 0000000..c6aa253
--- /dev/null
+++ b/jjb/sim-f1-interface/sim-f1-interface.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: sim-f1-interface-info
+    project: sim/f1-interface
+    project-name: sim-f1-interface
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/sim-fh-interface/sim-fh-interface.yaml b/jjb/sim-fh-interface/sim-fh-interface.yaml
new file mode 100644 (file)
index 0000000..cec668b
--- /dev/null
+++ b/jjb/sim-fh-interface/sim-fh-interface.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: sim-fh-interface-info
+    project: sim/fh-interface
+    project-name: sim-fh-interface
+    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 cc95d20..e8c9c0f 100644 (file)
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -9,7 +9,7 @@
     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
 

diff --git a/jjb/sim/sim.yaml b/jjb/sim/sim.yaml
new file mode 100644 (file)
index 0000000..a51af69
--- /dev/null
+++ b/jjb/sim/sim.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: sim-info
+    project: sim
+    project-name: sim
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify