Merge "Add com-golog"

diff --git a/global-jjb b/global-jjb
index c53e11d..fa5ddbf 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit c53e11db14ab7abede74c74801bec9ca381c8cc6
+Subproject commit fa5ddbf67c8b9ee78707c1d37abcbe16b4cb7cb4

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 91590c8..737d268 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -6,7 +6,7 @@ CLOUD_ZONE=sjc1
 
 # Default Template Configuration
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190419-213159.723
-VOLUME_SIZE=10
+VOLUME_SIZE=20
 HARDWARE_ID=v2-highcpu-1
 NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec
 USER_DATA_ID=jenkins-init-script

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
index 26cafd4..7108a83 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
 IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20190927-102054.131
 LABELS=ubuntu1804-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
-VOLUME_SIZE=10
+VOLUME_SIZE=20

diff --git a/jjb/com-pylog/com-pylog.yaml b/jjb/com-pylog/com-pylog.yaml
new file mode 100644 (file)
index 0000000..bcd9659
--- /dev/null
+++ b/jjb/com-pylog/com-pylog.yaml
@@ -0,0 +1,42 @@
+---
+- project:
+    name: com-pylog-project-view
+    project-name: com-pylog
+    views:
+      - project-view
+
+- project:
+    name: com-pylog-info
+    project: com/pylog
+    project-name: com-pylog
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- pylog_common: &pylog_common
+    name: pylog-common
+    # git repo
+    project: com/pylog
+    # jenkins job name prefix
+    project-name: com-pylog
+    # maven settings file has docker credentials
+    mvn-settings: com-pylog-settings
+    # sigul requires centos
+    build-node: centos7-builder-1c-1g
+
+# build package and publish to test.pypi.org
+- project:
+    <<: *pylog_common
+    name: pylog-pypi
+    stream:
+      - master:
+          branch: master
+    jobs:
+      - '{project-name}-gerrit-pypi-jobs'
+
+# promote package from test.pypi.org to pypi.org
+- project:
+    <<: *pylog_common
+    name: pylog-pypi-release
+    jobs:
+      - '{project-name}-gerrit-pypi-release-jobs'

diff --git a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
index 9374d8a..4559376 100644 (file)
--- a/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
+++ b/jjb/portal-ric-dashboard/portal-ric-dashboard.yaml
@@ -32,7 +32,9 @@
     jobs:
       - gerrit-maven-docker-verify
       - gerrit-maven-docker-merge
-      - gerrit-maven-docker-stage
+      - gerrit-maven-docker-stage:
+          # stage every Saturday, not daily
+          cron: 'H H * * 6'
     stream:
       - master:
           branch: master

diff --git a/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml b/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml
new file mode 100644 (file)
index 0000000..805702d
--- /dev/null
+++ b/jjb/ric-plt-resource-status-manager/ric-plt-resource-status-manager.yaml
@@ -0,0 +1,41 @@
+---
+- project:
+    name: ric-plt-resource-status-manager-project-view
+    project-name: ric-plt-resource-status-manager
+    views:
+      - project-view
+
+- project:
+    name: ric-plt-resource-status-manager-info
+    project: ric-plt/resource-status-manager
+    project-name: ric-plt-resource-status-manager
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- resource_status_manager_docker_common: &resource_status_manager_docker_common
+    # values apply to all resource status manager docker projects
+    name: resource-status-manager-docker-common
+    # git repo
+    project: ric-plt/resource-status-manager
+    # jenkins job name prefix
+    project-name: ric-plt-resource-status-manager
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-resource-status-manager-settings
+
+- project:
+    <<: *resource_status_manager_docker_common
+    name: ric-plt-resource-status-manager
+    # image name
+    docker-name: '{name}'
+    # Dockerfile is in a subdir
+    docker-root: RSM
+    # source of docker tag
+    container-tag-method: yaml-file
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host'
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/ric-plt-sdl/ric-plt-sdl.yaml b/jjb/ric-plt-sdl/ric-plt-sdl.yaml
new file mode 100644 (file)
index 0000000..fb188a5
--- /dev/null
+++ b/jjb/ric-plt-sdl/ric-plt-sdl.yaml
@@ -0,0 +1,40 @@
+---
+- project:
+    name: ric-plt-sdl-project-view
+    project-name: ric-plt-sdl
+    views:
+      - project-view
+
+- project:
+    name: ric-plt-sdl-info
+    project: ric-plt/sdl
+    project-name: ric-plt-sdl
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- sdl_docker_common: &sdl_docker_common
+    # values apply to all ric-plt/sdl docker projects
+    name: sdl-docker-common
+    # git repo
+    project: ric-plt/sdl
+    # jenkins job name prefix
+    project-name: ric-plt-sdl
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-sdl-settings
+
+- project:
+    <<: *sdl_docker_common
+    name: ric-plt-sdl
+    # use host network to clone from our gerrit
+    docker-build-args: '--network=host -f ci/Dockerfile'
+    # image name
+    docker-name: '{name}'
+    # image tag, use a fixed value
+    container-tag-method: latest
+    jobs:
+      - gerrit-docker-verify
+      - oran-gerrit-docker-ci-pc-merge
+    stream:
+      - master:
+          branch: master

diff --git a/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
new file mode 100644 (file)
index 0000000..c2cea4b
--- /dev/null
+++ b/jjb/ric-plt-sdlgo/ric-plt-sdlgo.yaml
@@ -0,0 +1,40 @@
+---
+- project:
+    name: ric-plt-sdlgo-project-view
+    project-name: ric-plt-sdlgo
+    views:
+      - project-view
+
+- project:
+    name: ric-plt-sdlgo-info
+    project: ric-plt/sdlgo
+    project-name: ric-plt-sdlgo
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- sdlgo_docker_common: &sdlgo_docker_common
+    # values apply to all sdlgo docker projects
+    name: sdlgo-docker-common
+    # git repo
+    project: ric-plt/sdlgo
+    # jenkins job name prefix
+    project-name: ric-plt-sdlgo
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-sdlgo-settings
+
+# runs unit tests on verify only
+- project:
+    <<: *sdlgo_docker_common
+    name: ric-plt-sdlgo
+    # 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