Merge "adding go-acc and sonar"

diff --git a/global-jjb b/global-jjb
index 794042c..98c1e38 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 794042ce858f009db24afb1b6d62bb2c33584c24
+Subproject commit 98c1e382ce72ee76c628c4741e17753c89901e07

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index c89c6b5..24795f0 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -30,8 +30,8 @@
     mvn-goals: 'clean install'
     # Default JVM invocation options
     mvn-opts: ''
-    mvn-site-id: 'oran-site'
-    mvn-staging-id: 'oran-staging'
+    mvn-site-id: site
+    mvn-staging-id: staging
     mvn-snapshot-id: snapshots
     staging-profile-id: 14a1ca3fc76ce
 

diff --git a/jjb/o-du-phy/o-du-phy.yaml b/jjb/o-du-phy/o-du-phy.yaml
new file mode 100644 (file)
index 0000000..118f5af
--- /dev/null
+++ b/jjb/o-du-phy/o-du-phy.yaml
@@ -0,0 +1,44 @@
+---
+- project:
+    name: o-du-phy-project-view
+    project-name: o-du-phy
+    views:
+      - project-view
+
+- project:
+    name: o-du-phy-info
+    project: o-du/phy
+    project-name: o-du-phy
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- o_du_phy_common: &o_du_phy_common
+    # values apply to all o-du/phy docker projects
+    name: o-du-phy-docker-common
+    # git repo
+    project: o-du/phy
+    # jenkins job name prefix
+    project-name: o-du-phy
+    # maven settings file has docker credentials
+    mvn-settings: o-du-phy-settings
+
+# build and publish packages to PackageCloud.io
+- project:
+    <<: *o_du_phy_common
+    name: o-du-phy-package
+    # jenkins job name prefix
+    project-name: '{name}'
+    # image is not pushed, use trivial tag
+    container-tag-method: latest
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # use host network for network resources
+    docker-build-args: '--network=host -f Dockerfile'
+    jobs:
+      - gerrit-docker-verify
+    #  - oran-gerrit-docker-ci-pc-merge
+    stream:
+      - master:
+          branch: master
+

diff --git a/jjb/oran-jjb/oran-docker-ci-jobs.yaml b/jjb/oran-jjb/oran-docker-ci-jobs.yaml
index 68a8908..995e611 100644 (file)
--- a/jjb/oran-jjb/oran-docker-ci-jobs.yaml
+++ b/jjb/oran-jjb/oran-docker-ci-jobs.yaml
@@ -81,6 +81,7 @@
     pre_docker_build_script: "# pre docker build script goes here"
     post_docker_build_script: "# post docker build script goes here"
     disable-job: "false"
+    docker-get-container-tag-script: "../shell/docker-get-container-tag.sh"
     docker-root: "$WORKSPACE"
     docker-build-args: ""
     git-url: "$GIT_URL/$PROJECT"
@@ -150,6 +151,7 @@
           container-tag-method: "{container-tag-method}"
           container-tag-yaml-dir: "{container-tag-yaml-dir}"
           docker-root: "{docker-root}"
+          docker-get-container-tag-script: "{docker-get-container-tag-script}"
       - lf-docker-build:
           docker-build-args: "{docker-build-args}"
           docker-name: "{docker-name}"

diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml
index 07fd3c4..7090367 100644 (file)
--- a/jjb/pti-rtp/pti-rtp.yaml
+++ b/jjb/pti-rtp/pti-rtp.yaml
@@ -21,6 +21,7 @@
     project-name: pti-rtp
     # maven settings file has credentials
     mvn-settings: pti-rtp-settings
+    mvn-site-id: site
     # use a centos with big memory; docker not required
     build-node: centos7-docker-2c-8g
 

diff --git a/jjb/ric-app-kpimon/ric-app-kpimon.yaml b/jjb/ric-app-kpimon/ric-app-kpimon.yaml
new file mode 100644 (file)
index 0000000..51f9ea8
--- /dev/null
+++ b/jjb/ric-app-kpimon/ric-app-kpimon.yaml
@@ -0,0 +1,49 @@
+---
+- project:
+    name: ric-app-kpimon-project-view
+    project-name: ric-app-kpimon
+    views:
+      - project-view
+
+- project:
+    name: ric-app-kpimon-info
+    project: ric-app/kpimon
+    project-name: ric-app-kpimon
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- ric_app_kpimon_docker_common: &ric_app_kpimon_docker_common
+    # values apply to all kpimon docker projects
+    name: ric-app-kpimon-docker-common
+    # git repo
+    project: ric-app/kpimon
+    # jenkins job name prefix
+    project-name: ric-app-kpimon
+    # maven settings file has docker credentials
+    mvn-settings: ric-app-kpimon-settings
+
+- project:
+    <<: *ric_app_kpimon_docker_common
+    name: ric-app-kpimon
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # 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
+
+- project:
+    <<: *ric_app_kpimon_docker_common
+    name: ric-app-kpimon-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'

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 bde2068..718b9fd 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -113,3 +113,21 @@
     tox-dir: src/bindings/rmr-python
     jobs:
       - gerrit-tox-sonar
+
+- project:
+    project: ric-plt/lib/rmr
+    project-name: ric-plt-lib-rmr
+    name: ric-plt-lib-rmr-release-verify
+    branch: master
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-packagecloud-release-verify
+
+- project:
+    project: ric-plt/lib/rmr
+    project-name: ric-plt-lib-rmr
+    name: ric-plt-lib-rmr-release-merge
+    branch: master
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-packagecloud-release-merge

diff --git a/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml b/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
index c9238e4..e1dacc5 100644 (file)
--- a/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
+++ b/jjb/scp-ocu-openlte/scp-ocu-openlte.yaml
@@ -29,7 +29,7 @@
     <<: *scp_ocu_openlte_common
     name: scp-ocu-openlte
     # image name
-    docker-name: 'o-ran-scp/{name}'
+    docker-name: 'o-ran-sc/scp/ocu-openlte'
     docker-build-args: '--network=host'
     jobs:
       - '{project-name}-gerrit-docker-jobs'
@@ -45,4 +45,4 @@
     # container release requires docker
     build-node: centos7-docker-2c-8g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
\ No newline at end of file
+      - '{project-name}-gerrit-release-jobs'