Add missing --network=host docker option

[ci-management.git] / jjb / ric-plt-lib-rmr / ric-plt-lib-rmr.yaml

diff --git a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
index 555fb36..951211c 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -5,48 +5,55 @@
     views:
       - project-view
 
+- project:
+    name: ric-plt-lib-rmr-info
+    project: ric-plt/lib/rmr
+    project-name: ric-plt-lib-rmr
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - rmr_docker_common: &rmr_docker_common
-    # values apply to all RIC docker-build projects.
-    # factored out in case rmr needs multiple projects.
-    # use a specific name to prevent reuse attempts
-    # because anchors don't cross document boundaries.
+    # values apply to all RMR docker projects
     name: rmr-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 because all builds are RCs
-    container-push-registry:  nexus3.o-ran-sc.org:10004
-    stream:
-      - master:
-          branch: master
-
-- project:
-    name: ric-plt-lib-rmr
     # git repo
     project: ric-plt/lib/rmr
     # jenkins job name prefix
-    project-name: '{name}'
-    # use host network to clone from our gerrit
-    docker-build-args: '--network=host -f ci/Dockerfile'
+    project-name: ric-plt-lib-rmr
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-lib-rmr-settings
+
+- project:
+    <<: *rmr_docker_common
+    name: ric-plt-lib-rmr
     # image name
     docker-name: '{name}'
+    # use host network to use network resources
+    docker-build-args: '--network=host -f ci/Dockerfile'
     # image tag; use a fixed value
     container-tag-method: latest
-    # maven settings file has docker credentials
-    mvn-settings: ric-plt-lib-rmr-settings
-    # copy deb to Jenkins filesystem
-    post_docker_build_script: !include-raw-escape:
-      - shell/copy-rmr-packages.sh
     jobs:
-      # merge pushes deb, not image
-      - '{project-name}-gerrit-docker-jobs'
-    <<: *rmr_docker_common
+      - gerrit-docker-verify
+      - oran-gerrit-docker-ci-pc-merge
+    stream:
+      - master:
+          branch: master
 
+# runs tox tests on verify only
 - project:
-    name: ric-plt-lib-rmr-info
-    project: ric-plt/lib/rmr
-    project-name: ric-plt-lib-rmr
-    build-node: centos7-builder-1c-1g
-
+    <<: *rmr_docker_common
+    name: ric-plt-lib-rmr-python-test
+    project-name: '{name}'
+    # image name, but is never pushed
+    docker-name: '{name}'
+    # source of docker tag
+    container-tag-method: latest
+    # subdirectory
+    docker-root: src/bindings/rmr-python
+    # use host network to use network resources
+    docker-build-args: '--network=host -f Dockerfile-Unit-Test'
+    stream:
+      - master:
+          branch: master
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-docker-verify