Merge "Refactor ORAN build-by-shell job templates"

diff --git a/.gitignore b/.gitignore
index c508e53..08ef323 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,7 @@ jenkins.ini
 .galaxy/
 *.retry
 cloud-env.json
+
+# IDE
+
+.idea/
\ No newline at end of file

diff --git a/jjb/com-gs-lite/com-gs-lite.yaml b/jjb/com-gs-lite/com-gs-lite.yaml
new file mode 100644 (file)
index 0000000..0ce130e
--- /dev/null
+++ b/jjb/com-gs-lite/com-gs-lite.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: com-gs-lite-project-view
+    project-name: com-gs-lite
+    views:
+      - project-view
+
+- project:
+    name: com-gs-lite-info
+    project: com/gs-lite
+    project-name: com-gs-lite
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
new file mode 100644 (file)
index 0000000..ff7e8ff
--- /dev/null
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: nonrtric-project-view
+    project-name: nonrtric
+    views:
+      - project-view
+
+- project:
+    name: nonrtric-info
+    project: nonrtric
+    project-name: nonrtric
+    branch: master
+    jobs:
+      - gerrit-info-yaml-verify

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 0c72868..bde2068 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -21,11 +21,6 @@
     project-name: ric-plt-lib-rmr
     # maven settings file has credentials
     mvn-settings: ric-plt-lib-rmr-settings
-
-# build and publish packages to PackageCloud.io
-- project:
-    <<: *rmr_common
-    name: ric-plt-lib-rmr
     # image is not pushed, use trivial tag
     container-tag-method: latest
     # image name
@@ -36,19 +31,35 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '^((?!src/bindings|\/COMMIT_MSG).)*$'
+
+# verify RMR changes targeted at any branch
+- project:
+    <<: *rmr_common
+    name: ric-plt-lib-rmr-verify
     jobs:
       - gerrit-docker-verify
-      - oran-gerrit-docker-ci-pc-merge
     stream:
-      # verify and push from all branches
       - all:
           branch: '*'
 
-# build and publish distributions to test.pypi.org
+# build RMR and publish to PackageCloud.io on merge to master branch
 - project:
     <<: *rmr_common
-    name: ric-plt-lib-rmr-python-pypi
+    name: ric-plt-lib-rmr-merge
+    jobs:
+      - oran-gerrit-docker-ci-pc-merge
+    stream:
+      - master:
+          branch: master
+
+- rmr_python_common: &rmr_python_common
+    name: rmr-python-common
+    # git repo
+    project: ric-plt/lib/rmr
+    # jenkins job name prefix
     project-name: ric-plt-lib-rmr-python
+    # maven settings file has credentials
+    mvn-settings: ric-plt-lib-rmr-settings
     # sigul requires centos
     build-node: centos7-builder-1c-1g
     # install prereqs
@@ -58,27 +69,37 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'src/bindings/rmr-python/.*'
+
+# verify binding changes targeted at any branch
+- project:
+    <<: *rmr_python_common
+    name: ric-plt-lib-rmr-python-pypi-verify
     stream:
-      # verify and push from all branches
       - all:
           branch: '*'
     jobs:
-      - '{project-name}-gerrit-pypi-jobs'
+      - gerrit-pypi-verify
+
+# build and publish distributions to test.pypi.org from master
+- project:
+    <<: *rmr_python_common
+    name: ric-plt-lib-rmr-python-pypi-merge
+    stream:
+      - master:
+          branch: master
+    jobs:
+      - gerrit-pypi-verify
 
 # promote distributions from test to pypi.org
 - project:
-    <<: *rmr_common
+    <<: *rmr_python_common
     name: ric-plt-lib-rmr-python-pypi-release
-    project-name: ric-plt-lib-rmr-python
-    # sigul requires centos
-    build-node: centos7-builder-1c-1g
     jobs:
       - '{project-name}-gerrit-pypi-release-jobs'
 
 - project:
-    <<: *rmr_common
+    <<: *rmr_python_common
     name: ric-plt-lib-rmr-python-sonar
-    project-name: ric-plt-lib-rmr-python
     branch: master
     python-version: python3
     # the pre-build-script installs debian packages

diff --git a/jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml b/jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml
new file mode 100644 (file)
index 0000000..834d596
--- /dev/null
+++ b/jjb/ric-plt-xapp-frame/ric-plt-xapp-frame.yaml
@@ -0,0 +1,40 @@
+---
+- project:
+    name: ric-plt-xapp-frame-project-view
+    project-name: ric-plt-xapp-frame
+    views:
+      - project-view
+
+- project:
+    name: ric-plt-xapp-frame-info
+    project: ric-plt/xapp-frame
+    project-name: ric-plt-xapp-frame
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- xapp_frame_docker_common: &xapp_frame_docker_common
+    # values apply to all xapp-frame docker projects
+    name: xapp-frame-docker-common
+    # git repo
+    project: ric-plt/xapp-frame
+    # jenkins job name prefix
+    project-name: ric-plt-xapp-frame
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-xapp-frame-settings
+
+# runs unit tests on verify only
+- project:
+    <<: *xapp_frame_docker_common
+    name: ric-plt-xapp-frame
+    # image name, altho it is never pushed
+    docker-name: '{name}'
+    # use host network
+    docker-build-args: '--network=host -f ci/Dockerfile'
+    # image tag; use a fixed value
+    container-tag-method: latest
+    jobs:
+      - gerrit-docker-verify
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/ric-plt/dbaas/hiredis-vip/info-ric-plt-dbaas-hiredis-vip.yaml b/jjb/ric-plt/dbaas/hiredis-vip/info-ric-plt-dbaas-hiredis-vip.yaml
new file mode 100644 (file)
index 0000000..ed9dd77
--- /dev/null
+++ b/jjb/ric-plt/dbaas/hiredis-vip/info-ric-plt-dbaas-hiredis-vip.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-dbaas-hiredis-vip-info
+    project-name: ric-plt-dbaas-hiredis-vip
+    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/info-ric-plt-demo1.yaml
new file mode 100644 (file)
index 0000000..b89f6f5
--- /dev/null
+++ b/jjb/ric-plt/demo1/info-ric-plt-demo1.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-demo1-info
+    project-name: ric-plt-demo1
+    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/info-ric-plt-jaegeradapter.yaml
new file mode 100644 (file)
index 0000000..2a9e681
--- /dev/null
+++ b/jjb/ric-plt/jaegeradapter/info-ric-plt-jaegeradapter.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-jaegeradapter-info
+    project-name: ric-plt-jaegeradapter
+    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/info-ric-plt-nodeb-rnib.yaml
new file mode 100644 (file)
index 0000000..48d98ee
--- /dev/null
+++ b/jjb/ric-plt/nodeb-rnib/info-ric-plt-nodeb-rnib.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-nodeb-rnib-info
+    project-name: ric-plt-nodeb-rnib
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ric-plt/nodeb-rnib
+    branch: master

diff --git a/jjb/ric-plt/resource-status-processor/info-ric-plt-resource-status-processor.yaml b/jjb/ric-plt/resource-status-processor/info-ric-plt-resource-status-processor.yaml
new file mode 100644 (file)
index 0000000..6ac5f68
--- /dev/null
+++ b/jjb/ric-plt/resource-status-processor/info-ric-plt-resource-status-processor.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-resource-status-processor-info
+    project-name: ric-plt-resource-status-processor
+    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/info-ric-plt-ric-dep.yaml
new file mode 100644 (file)
index 0000000..24eae53
--- /dev/null
+++ b/jjb/ric-plt/ric-dep/info-ric-plt-ric-dep.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-ric-dep-info
+    project-name: ric-plt-ric-dep
+    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/info-ric-plt-ric-test.yaml
new file mode 100644 (file)
index 0000000..a8b8814
--- /dev/null
+++ b/jjb/ric-plt/ric-test/info-ric-plt-ric-test.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-ric-test-info
+    project-name: ric-plt-ric-test
+    jobs:
+      - gerrit-info-yaml-verify
+    project: ric-plt/ric-test
+    branch: master

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

diff --git a/jjb/ric-plt/streaming-protobufs/info-ric-plt-streaming-protobufs.yaml b/jjb/ric-plt/streaming-protobufs/info-ric-plt-streaming-protobufs.yaml
new file mode 100644 (file)
index 0000000..a809651
--- /dev/null
+++ b/jjb/ric-plt/streaming-protobufs/info-ric-plt-streaming-protobufs.yaml
@@ -0,0 +1,8 @@
+---
+- project:
+    name: ric-plt-streaming-protobufs-info
+    project-name: ric-plt-streaming-protobufs
+    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
new file mode 100644 (file)
index 0000000..9c61a86
--- /dev/null
+++ b/jjb/ric-plt/utils/info-ric-plt-utils.yaml
@@ -0,0 +1,8 @@
+---
+- 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/read-the-docs/rtd.yaml b/jjb/rtdv3/rtdv3.yaml
similarity index 54%
rename from jjb/read-the-docs/rtd.yaml
rename to jjb/rtdv3/rtdv3.yaml
index 8715884..25f325d 100644 (file)
--- a/jjb/read-the-docs/rtd.yaml
+++ b/jjb/rtdv3/rtdv3.yaml
@@ -1,7 +1,9 @@
-# Global read the docs jobs
+# Global read the docs version 3 jobs
 #
 # jobs trigger for all projects on any changes
 # to files in the docs/* directory
+# and publish subprojects to readthedocs.io
+# using credentials from Jenkins settings
 ---
 - project:
     name: rtdv3-view
@@ -12,6 +14,11 @@
 - project:
     name: rtdv3-global
     build-node: centos7-builder-1c-1g
+    # override the default to ignore ref-updated-event
+    gerrit_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: remerge$
     jobs:
       - rtdv3-global-verify
       - rtdv3-global-merge