Merge "Add docker-root parameter to find Dockerfile"

diff --git a/docker/bldr-debian-python-nng/Dockerfile b/docker/bldr-debian-python-nng/Dockerfile
new file mode 100644 (file)
index 0000000..bfb46fc
--- /dev/null
+++ b/docker/bldr-debian-python-nng/Dockerfile
@@ -0,0 +1,45 @@
+# 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
+
+RUN git clone https://github.com/nanomsg/nng.git \
+    && cd nng \
+    && mkdir build \
+    && cd build \
+    && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
+    && ninja \
+    && ninja install

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

diff --git a/jjb/ci-management/ci-docker.yaml b/jjb/ci-management/ci-docker.yaml
index c5d6e42..c0854f7 100644 (file)
--- a/jjb/ci-management/ci-docker.yaml
+++ b/jjb/ci-management/ci-docker.yaml
@@ -20,7 +20,7 @@
 
 - project:
     <<: *ci_docker_common
-    name: bldr-ric-debian-python
+    name: bldr-debian-python-nng
     project-name: '{project}-{name}'
     docker-name: '{name}'
     docker-root: 'docker/{name}'

diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
new file mode 100644 (file)
index 0000000..b78eb71
--- /dev/null
+++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
@@ -0,0 +1,50 @@
+---
+- project:
+    name: ric-plt-e2mgr-project-view
+    project-name: ric-plt-e2mgr
+    views:
+      - project-view
+
+- e2mgr_docker_common: &e2mgr_docker_common
+    # values apply to all RIC docker-build projects.
+    # factored out in case this needs multiple projects.
+    # use a specific name to prevent reuse attempts
+    # bcos anchors don't cross document boundaries.
+    name: e2mgr-docker-common
+    build-node: ubuntu1804-docker-4c-4g
+    # pull from the public mirror + releases registry
+    container-public-registry: nexus3.o-ran-sc.org:10001
+    # push to the staging repo bcos all builds are RCs
+    container-push-registry: nexus3.o-ran-sc.org:10004
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    # source of docker tag
+    container-tag-method: yaml-file
+    stream:
+      - master:
+          branch: master
+
+- project:
+    name: ric-plt-e2mgr
+    # git repo
+    project: ric-plt/e2mgr
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image name
+    docker-name: '{name}'
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-e2mgr-settings
+    # Dockerfile is in a subdir
+    docker-root: E2Manager
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    <<: *e2mgr_docker_common
+
+- project:
+    name: ric-plt-e2mgr-info
+    project: ric-plt/e2mgr
+    project-name: ric-plt-e2mgr
+    build-node: centos7-builder-1c-1g
+
+    jobs:
+      - gerrit-info-yaml-verify