Merge "Automation adds scp-ocu-5gnr.yaml"

diff --git a/global-jjb b/global-jjb
index 89213a1..64faafa 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 89213a114af3775da43b5f97c3584db516d49987
+Subproject commit 64faafae2362d36e4d5c3e8d5fe6579b9d09cf55

diff --git a/jjb/com-log/com-log.yaml b/jjb/com-log/com-log.yaml
index e5876e6..658bca0 100644 (file)
--- a/jjb/com-log/com-log.yaml
+++ b/jjb/com-log/com-log.yaml
@@ -31,6 +31,10 @@
     name: com-log-lib
     build-node: ubuntu1804-builder-2c-2g
     make-opts: -j 2 test
+    # do not trigger on changes in docs, releases
+    gerrit_trigger_file_paths:
+        - compare-type: REG_EXP
+          pattern: '^((?!docs\/|releases\/|\/COMMIT_MSG).)*$'
     jobs:
       - gerrit-autotools-verify
     stream:

diff --git a/jjb/it-otf/it-otf.yaml b/jjb/it-otf/it-otf.yaml
index e4ff23d..db1c9b9 100644 (file)
--- a/jjb/it-otf/it-otf.yaml
+++ b/jjb/it-otf/it-otf.yaml
@@ -15,15 +15,25 @@
 
 - it_otf_common: &it_otf_common
     # values apply to all it/otf docker projects
-    name: it-otf-docker-common
+    name: it_otf_common
     # git repo
     project: it/otf
     # jenkins job name prefix
-    project-name: it-otf
+    project-name: '{name}'
     # source of docker tag
     container-tag-method: yaml-file
     # maven settings file has docker credentials
     mvn-settings: it-otf-settings
+    # image name
+    docker-name: 'o-ran-sc/{name}'
+    # dockerfile is in subdir of docker root
+    docker-build-args: '--network=host -f ./docker/Dockerfile'
+    # tag file is in subdir
+    container-tag-yaml-dir: '{docker-root}/docker'
+    # build only on relevant changes
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: '{docker-root}/.*'
     jobs:
       - '{project-name}-gerrit-docker-jobs'
     stream:
@@ -33,187 +43,104 @@
 - project:
     <<: *it_otf_common
     name: it-otf-oran-ric-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: oran-ric-test-head
     # dockerfile is in subdir of docker root
     docker-build-args: '--network=host'
     # tag file is in subdir
     container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-frontend
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-frontend
     # dockerfile is in subdir of docker root
     docker-build-args: '--network=host'
     # tag file is in subdir
     container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-ping-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-ping-test-head
     # dockerfile is in subdir of docker root
     docker-build-args: '--network=host'
     # tag file is in subdir
     container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-robot-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-robot-test-head
     # dockerfile is in subdir of docker root
     docker-build-args: '--network=host'
     # tag file is in subdir
     container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-ssh-test-head
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-ssh-test-head
     # dockerfile is in subdir of docker root
     docker-build-args: '--network=host'
     # tag file is in subdir
     container-tag-yaml-dir: '{docker-root}'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-camunda
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-camunda
-    # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f ./docker/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}/docker'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-service-api
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: otf-service-api
-    # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f ./docker/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}/docker'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-smo-o1-vth
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: smo-o1-vth
-    # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f ./docker/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}/docker'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-dmaap-vth
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: dmaap-vth
-    # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f ./docker/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}/docker'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
     name: it-otf-a1-mediator-vth
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: 'o-ran-sc/{name}'
     # start in parent directory with shared files
     docker-root: a1-mediator-vth
-    # dockerfile is in subdir of docker root
-    docker-build-args: '--network=host -f ./docker/Dockerfile'
-    # tag file is in subdir
-    container-tag-yaml-dir: '{docker-root}/docker'
-    # build only on relevant changes
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: '{docker-root}/.*'
 
 - project:
     <<: *it_otf_common
+    name: it-otf-a1-sdnc-vth
+    # start in parent directory with shared files
+    docker-root: a1-sdnc-vth
+
+- project:
+    <<: *it_otf_common
+    name: it-otf-a1-policy-manager-vth
+    # start in parent directory with shared files
+    docker-root: a1-policy-manager-vth
+
+- project:
     name: it-otf-release
-    branch: master
+    project: it/otf
+    # jenkins job name prefix
+    project-name: it-otf
+    # source of docker tag
+    container-tag-method: yaml-file
+    # maven settings file has docker credentials
+    mvn-settings: it-otf-settings
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/it-test/it-test.yaml b/jjb/it-test/it-test.yaml
index f45b777..4d9fa57 100644 (file)
--- a/jjb/it-test/it-test.yaml
+++ b/jjb/it-test/it-test.yaml
@@ -71,9 +71,8 @@
 - project:
     <<: *it_test_common
     name: it-test-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'
\ No newline at end of file
+      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index c1c34d8..4d85643 100644 (file)
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -22,32 +22,26 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
     mvn-version: mvn36
-
-- nonrtric_jdk11: &nonrtric_jdk11
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk11
     java-version: openjdk11
 
-- nonrtric_jdk8: &nonrtric_jdk8
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk8
-    java-version: openjdk8
-
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
     jobs:
-      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-verify:
+          mvn-opts: -Dexec.skip=false
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
     stream:
       - master:
           branch: master
+      - bronze:
+          branch: bronze
 
 # nonrtric:policy-agent
 # Maven artifacts for nonrtric-policy-agent
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-policy-agent
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
@@ -64,11 +58,13 @@
     stream:
       - master:
           branch: master
+      - bronze:
+          branch: bronze
 
 # nonrtric:sdnc-a1-controller
 # Maven artifacts for nonrtric-sdnc-a1-controller
 - project:
-    <<: *nonrtric_jdk8
+    <<: *nonrtric_jdk_common
     name: nonrtric-sdnc-a1-controller
     project-name: '{name}'
     mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
@@ -85,11 +81,12 @@
     stream:
       - master:
           branch: master
+      - bronze:
+          branch: bronze
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
@@ -97,7 +94,7 @@
       - '{project-name}-gerrit-release-jobs'
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-sonar
     # template goal install builds docker image unnecessarily
     mvn-params: '-Ddocker.skip=true -Dexec.skip=true'

diff --git a/jjb/o-du-l2/o-du-l2.yaml b/jjb/o-du-l2/o-du-l2.yaml
index b112486..a8a4aaa 100644 (file)
--- a/jjb/o-du-l2/o-du-l2.yaml
+++ b/jjb/o-du-l2/o-du-l2.yaml
@@ -56,9 +56,8 @@
 - project:
     <<: *o_du_l2_common
     name: o-du-l2-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'
\ No newline at end of file
+      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
new file mode 100644 (file)
index 0000000..dedb939
--- /dev/null
+++ b/jjb/oam-tr069-adapter/oam-tr069-adapter.yaml
@@ -0,0 +1,59 @@
+---
+- project:
+    name: oam-tr069-adapter-project-view
+    project-name: oam-tr069-adapter
+    views:
+      - project-view
+
+- project:
+    name: oam-tr069-adapter-info
+    project: oam/tr069-adapter
+    project-name: oam-tr069-adapter
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
+- tr069-adapter-jdk08: &tr069-adapter-jdk08
+    # values apply to all projects here
+    name: tr069-adapter-jdk08
+    # git repo
+    project: oam/tr069-adapter
+    # jenkins job name prefix
+    project-name: oam-tr069-adapter
+    mvn-settings: oam-tr069-adapter-settings
+    # defaults.yaml value is NOT used due to value set in lf-maven-jobs.yaml
+    java-version: openjdk8
+    mvn-version: mvn36
+
+- project:
+    <<: *tr069-adapter-jdk08
+    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *tr069-adapter-jdk08
+    name: tr069-adapter-sonar
+    # template goal install builds docker image unnecessarily
+    mvn-params: -Ddocker.skip=true
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    jobs:
+      - gerrit-maven-sonar
+
+- project:
+    <<: *tr069-adapter-jdk08
+    name: tr069-adapter-release
+    # 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/pti-rtp/build-yocto.sh b/jjb/pti-rtp/build-inf.sh
similarity index 85%
rename from jjb/pti-rtp/build-yocto.sh
rename to jjb/pti-rtp/build-inf.sh
index 5e9fbdc..3af0737 100644 (file)
--- a/jjb/pti-rtp/build-yocto.sh
+++ b/jjb/pti-rtp/build-inf.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#   Copyright (C) 2019 Wind River Systems, Inc.
+#   Copyright (C) 2020 Wind River Systems, Inc.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # Builds a Yocto image for real.
 # Assumes prereqs have already been installed.
 
-echo "--> build-yocto.sh"
+echo "--> build-inf.sh"
 
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
@@ -25,8 +25,7 @@ set -eu -o pipefail
 dir=workspace
 echo "INFO: creating workspace $dir"
 mkdir $dir
-cmd="./scripts/build_oran.sh -w $dir"
+cmd="./scripts/build_inf.sh -w $dir"
 echo "INFO: invoking build script: $cmd"
 $cmd
-
-echo "--> build-yocto.sh ends"
+echo "--> build-inf.sh ends"

diff --git a/jjb/pti-rtp/install-yocto-prereq-centos.sh b/jjb/pti-rtp/install-yocto-prereq-centos.sh
index 55c2abc..dc2c796 100644 (file)
--- a/jjb/pti-rtp/install-yocto-prereq-centos.sh
+++ b/jjb/pti-rtp/install-yocto-prereq-centos.sh
@@ -30,4 +30,7 @@ sudo yum install -y epel-release \
   && sudo yum makecache \
   && sudo yum install -y $pkgs
 
+git config --global user.name "oran inf builder"
+git config --global user.email "oran.inf@windriver.com"
+
 echo "--> install-yocto-prereq-centos.sh ends"

diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml
index a3d8e9a..4991caa 100644 (file)
--- a/jjb/pti-rtp/pti-rtp.yaml
+++ b/jjb/pti-rtp/pti-rtp.yaml
@@ -34,7 +34,7 @@
     build-timeout: 120
     script: !include-raw-escape:
         - install-yocto-prereq-centos.sh
-        - verify-yocto.sh
+        - verify-inf.sh
     jobs:
       - oran-shell-verify
 
@@ -45,7 +45,7 @@
     build-timeout: 120
     script: !include-raw-escape:
         - install-yocto-prereq-centos.sh
-        - verify-yocto.sh
+        - verify-inf.sh
     jobs:
       - oran-shell-merge
 
@@ -54,11 +54,11 @@
     name: pti-rtp-release-merge
     # demand 200GB storage
     build-node: centos7-docker-2c-8g-200g
-    # runs about 18 hours
-    build-timeout: 1200
+    # runs about 48 hours
+    build-timeout: 2880
     script: !include-raw-escape:
         - install-yocto-prereq-centos.sh
-        - build-yocto.sh
-        - upload-yocto.sh
+        - build-inf.sh
+        - upload-inf.sh
     jobs:
       - oran-shell-release

diff --git a/jjb/pti-rtp/upload-yocto.sh b/jjb/pti-rtp/upload-inf.sh
similarity index 82%
rename from jjb/pti-rtp/upload-yocto.sh
rename to jjb/pti-rtp/upload-inf.sh
index 35b4bae..d95b282 100644 (file)
--- a/jjb/pti-rtp/upload-yocto.sh
+++ b/jjb/pti-rtp/upload-inf.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#   Copyright (C) 2019 Wind River Systems, Inc.
+#   Copyright (C) 2020 Wind River Systems, Inc.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 # Uploads a Yocto image to Nexus.
 
-echo "--> upload-yocto.sh"
+echo "--> upload-inf.sh"
 
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
@@ -41,7 +41,8 @@ mkdir -p "$repo_iso_dir"
 
 # Expect ISO file: oran-image-inf-host-intel-x86-64.iso
 # in build subdir: workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/
-iso="workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso"
+#iso="workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso"
+iso="workspace/prj_oran_inf_anaconda/tmp-glibc/deploy/images/intel-corei7-64/inf-image-aio-installer-intel-corei7-64.iso"
 echo "INFO: copy $iso to staging directory $repo_iso_dir"
 cp "$iso" "$repo_iso_dir"
 
@@ -49,4 +50,4 @@ cmd="lftools deploy nexus $nexus_repo_url $repo_dir"
 echo "INFO: Upload ISO to Nexus: $cmd"
 $cmd
 
-echo "--> upload-yocto.sh ends"
+echo "--> upload-inf.sh ends"

diff --git a/jjb/pti-rtp/verify-yocto.sh b/jjb/pti-rtp/verify-inf.sh
similarity index 85%
rename from jjb/pti-rtp/verify-yocto.sh
rename to jjb/pti-rtp/verify-inf.sh
index da13788..2d7b44b 100644 (file)
--- a/jjb/pti-rtp/verify-yocto.sh
+++ b/jjb/pti-rtp/verify-inf.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-#   Copyright (C) 2019 Wind River Systems, Inc.
+#   Copyright (C) 2020 Wind River Systems, Inc.
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 # Tests creation of a Yocto image.  The "-n" flag skips bitbake.
 # Assumes prereqs have already been installed.
 
-echo "--> verify-yocto.sh"
+echo "--> verify-inf.sh"
 
 # Ensure we fail the job if any steps fail.
 set -eu -o pipefail
@@ -25,8 +25,8 @@ set -eu -o pipefail
 dir=workspace
 echo "INFO: creating workspace $dir"
 mkdir $dir
-cmd="./scripts/build_oran.sh -w $dir -n"
+cmd="./scripts/build_inf.sh -w $dir -n"
 echo "INFO: invoking build script: $cmd"
 $cmd
 
-echo "--> verify-yocto.sh ends"
+echo "--> verify-inf.sh ends"

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

diff --git a/jjb/ric-app-admin/ric-app-admin.yaml b/jjb/ric-app-admin/ric-app-admin.yaml
index 680be6d..dfbe4be 100644 (file)
--- a/jjb/ric-app-admin/ric-app-admin.yaml
+++ b/jjb/ric-app-admin/ric-app-admin.yaml
@@ -41,7 +41,6 @@
 - project:
     <<: *admin_docker_common
     name: ric-app-admin-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     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
index 51f9ea8..03bd74e 100644 (file)
--- a/jjb/ric-app-kpimon/ric-app-kpimon.yaml
+++ b/jjb/ric-app-kpimon/ric-app-kpimon.yaml
@@ -41,7 +41,6 @@
 - 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

diff --git a/jjb/ric-app-mc/ric-app-mc.yaml b/jjb/ric-app-mc/ric-app-mc.yaml
index de57c8f..2243867 100644 (file)
--- a/jjb/ric-app-mc/ric-app-mc.yaml
+++ b/jjb/ric-app-mc/ric-app-mc.yaml
@@ -69,7 +69,6 @@
     <<: *mc_common
     name: ric-app-mc-release
     project-name: ric-app-mc
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-app-ml/ric-app-ml.yaml b/jjb/ric-app-ml/ric-app-ml.yaml
index 0989c97..b6dce85 100644 (file)
--- a/jjb/ric-app-ml/ric-app-ml.yaml
+++ b/jjb/ric-app-ml/ric-app-ml.yaml
@@ -46,7 +46,6 @@
 - project:
     <<: *ric_app_ml_docker_common
     name: ric-app-ml-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index 7e04756..81cf043 100644 (file)
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -96,7 +96,6 @@
 - project:
     <<: *a1_common
     name: ric-plt-a1-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml b/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
index a832655..4e0c94b 100644 (file)
--- a/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
+++ b/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
@@ -69,3 +69,10 @@
         sonar.exclusions=**/*_test.go
     jobs:
       - gerrit-sonar-prescan-script
+
+- project:
+    <<: *alarm_go_common
+    name: ric-plt-alarm-go-release
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
index 7f834e2..8aff3c6 100644 (file)
--- a/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
+++ b/jjb/ric-plt-appmgr/ric-plt-appmgr.yaml
@@ -41,7 +41,6 @@
 - project:
     <<: *appmgr_docker_common
     name: ric-plt-appmgr-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
index 06d4fce..cc525c4 100644 (file)
--- a/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
+++ b/jjb/ric-plt-dbaas/ric-plt-dbaas.yaml
@@ -41,7 +41,6 @@
 - project:
     <<: *dbaas_docker_common
     name: ric-plt-dbaas-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-e2/ric-plt-e2.yaml b/jjb/ric-plt-e2/ric-plt-e2.yaml
index 81e32ce..a7fdb80 100644 (file)
--- a/jjb/ric-plt-e2/ric-plt-e2.yaml
+++ b/jjb/ric-plt-e2/ric-plt-e2.yaml
@@ -43,7 +43,6 @@
 - project:
     <<: *e2_docker_common
     name: ric-plt-e2-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
index 872bbc2..1288b59 100644 (file)
--- a/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
+++ b/jjb/ric-plt-e2mgr/ric-plt-e2mgr.yaml
@@ -43,7 +43,6 @@
 - project:
     <<: *e2mgr_docker_common
     name: ric-plt-e2mgr-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-o1/ric-plt-o1.yaml b/jjb/ric-plt-o1/ric-plt-o1.yaml
index 6d555a2..853e852 100644 (file)
--- a/jjb/ric-plt-o1/ric-plt-o1.yaml
+++ b/jjb/ric-plt-o1/ric-plt-o1.yaml
@@ -41,7 +41,6 @@
 - project:
     <<: *o1_docker_common
     name: ric-plt-o1-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

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
index 8bba904..4136e0d 100644 (file)
--- 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
@@ -43,7 +43,6 @@
 - project:
     <<: *resource_status_manager_docker_common
     name: ric-plt-resource-status-manager-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
index 30fab68..d958997 100644 (file)
--- a/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
+++ b/jjb/ric-plt-rtmgr/ric-plt-rtmgr.yaml
@@ -41,7 +41,6 @@
 - project:
     <<: *rtmgr_docker_common
     name: ric-plt-rtmgr-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-submgr/ric-plt-submgr.yaml b/jjb/ric-plt-submgr/ric-plt-submgr.yaml
index 9607501..5ca703a 100644 (file)
--- a/jjb/ric-plt-submgr/ric-plt-submgr.yaml
+++ b/jjb/ric-plt-submgr/ric-plt-submgr.yaml
@@ -41,7 +41,6 @@
 - project:
     <<: *submgr_docker_common
     name: ric-plt-submgr-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

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

diff --git a/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml
index 5282f98..f76407f 100644 (file)
--- a/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml
+++ b/jjb/ric-plt-vespamgr/ric-plt-vespamgr.yaml
@@ -41,7 +41,6 @@
 - project:
     <<: *vespamgr_docker_common
     name: ric-plt-vespamgr-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g

diff --git a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
index 51d2447..ca0f539 100644 (file)
--- a/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
+++ b/jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
@@ -75,6 +75,16 @@
       - master:
           branch: master
 
+# promote deb/rpm from staging to release at PackageCloud.io
+- project:
+    <<: *xapp_frame_cpp_common
+    name: ric-plt-xapp-frame-cpp-release
+    # release uses sigul which requires centos
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-packagecloud-release-verify
+      - gerrit-packagecloud-release-merge
+
 # analyze C code and test coverage
 - project:
     name: xapp-frame-cpp-sonarqube

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

diff --git a/jjb/sim-e2-interface/sim-e2-interface.yaml b/jjb/sim-e2-interface/sim-e2-interface.yaml
index 6307700..43fd59d 100644 (file)
--- a/jjb/sim-e2-interface/sim-e2-interface.yaml
+++ b/jjb/sim-e2-interface/sim-e2-interface.yaml
@@ -13,29 +13,21 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- sim_e2_interface_docker: &sim_e2_interface_docker
-    # values apply to all sim/e2-interface docker projects
-    name: sim-e2-interface-docker
+- sim_e2_interface_common: &sim_e2_interface_common
+    # values apply to all projects here
+    name: sim-e2-interface-common
     # git repo
     project: sim/e2-interface
     # jenkins job name prefix
     project-name: sim-e2-interface
     # maven settings file has docker credentials
     mvn-settings: sim-e2-interface-settings
-    # source of docker tag
-    container-tag-method: yaml-file
-    build-node: ubuntu1804-docker-4c-4g
-    jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    stream:
-      - master:
-          branch: master
 
 - project:
-    <<: *sim_e2_interface_docker
-    name: sim-e2-interface-e2sim
-    # jenkins job name prefix
-    project-name: '{name}'
+    <<: *sim_e2_interface_common
+    name: sim-e2-interface-docker
+    build-node: ubuntu1804-docker-4c-4g
+    container-tag-method: yaml-file
     # image name
     docker-name: 'o-ran-sc/ntsim-e2-simulator'
     # docker root
@@ -47,3 +39,17 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: '{docker-root}/.*'
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *sim_e2_interface_common
+    name: sim-e2-interface-release
+    # sigul requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
+    jobs:
+      - '{project-name}-gerrit-release-jobs'

diff --git a/jjb/sim-o1-interface/sim-o1-interface.yaml b/jjb/sim-o1-interface/sim-o1-interface.yaml
index 0885b29..16c15e7 100644 (file)
--- a/jjb/sim-o1-interface/sim-o1-interface.yaml
+++ b/jjb/sim-o1-interface/sim-o1-interface.yaml
@@ -99,7 +99,6 @@
 - project:
     <<: *sim_o1_interface_docker
     name: sim-o1-interface-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g