Merge "Update jjb for pti-rtp project"
authorEric Ball <eball@linuxfoundation.org>
Wed, 1 Jul 2020 15:02:45 +0000 (15:02 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Wed, 1 Jul 2020 15:02:45 +0000 (15:02 +0000)
global-jjb
jjb/com-log/com-log.yaml
jjb/com-log/setup-com-log-build-deb.sh [new file with mode: 0644]
jjb/it-otf/it-otf.yaml
jjb/nonrtric/nonrtric.yaml
jjb/oam-tr069-adapter/oam-tr069-adapter.yaml [new file with mode: 0644]
jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
jjb/ric-plt-xapp-frame-cpp/ric-plt-xapp-frame-cpp.yaml
jjb/scp-ric-app-kpimon/scp-ric-app-kpimon.yaml [new file with mode: 0644]
jjb/sim-e2-interface/sim-e2-interface.yaml

index 89213a1..99e1a22 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 89213a114af3775da43b5f97c3584db516d49987
+Subproject commit 99e1a22608c6aa57ea78567683e98fcbcc9eb552
index 7915ffc..658bca0 100644 (file)
     jobs:
       - gerrit-info-yaml-verify
 
-- log_docker_common: &log_docker_common
-    # values apply to all com/log docker projects
-    name: log-docker-common
+- com_log_common: &com_log_common
+    # values apply to all com/log projects
+    name: com-log-common
     # git repo
     project: com/log
     # jenkins job name prefix
     project-name: com-log
     # maven settings file has docker credentials
     mvn-settings: com-log-settings
+    # verify/merge/package/sonar all require this
+    pre-build: !include-raw-escape: setup-com-log-build-deb.sh
 
+# compile code and run tests
 - project:
-    <<: *log_docker_common
-    name: com-log
-    # 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
+    <<: *com_log_common
+    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-docker-verify
-      - oran-gerrit-docker-ci-pc-merge
+      - gerrit-autotools-verify
     stream:
       - master:
           branch: master
 
+# common settings for building DEB and RPM packages
+- com_log_pkg_common: &com_log_pkg_common
+    name: com-log-pkg-common
+    # directory with package files
+    build-dir: pkg
+    # docker image has the package_cloud gem
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - gerrit-autotools-packagecloud-stage
+    stream:
+      - master:
+          branch: master
+
+# build DEB package files
+- project:
+    <<: *com_log_common
+    <<: *com_log_pkg_common
+    name: com-log-deb
+    project-name: '{name}'
+    configure-opts: --with-deb-dir={build-dir}
+    make-opts: -j4 deb-pkg
+
+# build RPM package files
+- project:
+    <<: *com_log_common
+    <<: *com_log_pkg_common
+    name: com-log-rpm
+    project-name: '{name}'
+    configure-opts: --with-rpm-dir={build-dir}
+    # parallel jobs (option -j) fail on rpm build
+    # https://bugzilla.redhat.com/show_bug.cgi?id=1398405
+    make-opts: rpm-pkg
+
+# analyze C code and test coverage
+- project:
+    <<: *com_log_common
+    name: com-log-sonarqube
+    build-node: ubuntu1804-docker-4c-4g
+    # set appropriate CXXFLAGS
+    configure-opts: --with-gcov-report-dir=gcov_report
+    # use all cores
+    make-opts: -j4 test_gcov
+    sonar-project-file: ""
+    sonar-properties: |
+        sonar.login={sonarcloud_api_token}
+        sonar.projectKey={sonarcloud_project_organization}_{project-name}
+        sonar.projectName={project-name}
+        sonar.organization={sonarcloud_project_organization}
+        sonar.build.sourceEncoding=UTF-8
+        sonar.sources=src
+        sonar.cfamily.build-wrapper-output=$WORKSPACE/bw-output
+        sonar.cfamily.cache.enabled=false
+        sonar.cfamily.gcov.reportsPath=gcov_report
+        sonar.cfamily.threads=4
+    jobs:
+      - gerrit-autotools-sonarqube
+
 - project:
+    <<: *com_log_common
+    # these templates ignore the pre-build script
     name: com-log-release
-    project: com/log
-    project-name: com-log
-    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-packagecloud-release-verify
       - gerrit-packagecloud-release-merge
+
diff --git a/jjb/com-log/setup-com-log-build-deb.sh b/jjb/com-log/setup-com-log-build-deb.sh
new file mode 100644 (file)
index 0000000..d952b32
--- /dev/null
@@ -0,0 +1,36 @@
+#!/bin/bash
+##############################################################################
+#
+#   Copyright (c) 2020 AT&T Intellectual Property.
+#   Copyright (c) 2020 Nokia.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+##############################################################################
+
+# Installs prerequisites needed to compile & test com/log code
+# and build RPM/DEB packages on a Debian/Ubuntu machine.
+
+echo "--> setup-com-log-build-deb.sh"
+
+# Ensure we fail the job if any steps fail.
+set -eux -o pipefail
+
+# install prereqs
+sudo apt-get update && sudo apt-get -q -y install \
+  autoconf-archive libjsoncpp-dev rpm valgrind
+
+# generate configure script
+autoreconf --install
+
+echo "--> setup-com-log-build-deb.sh ends"
index e4ff23d..8b681f7 100644 (file)
 
 - 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:
 - 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
+    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
     branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
index b8965bc..165739a 100644 (file)
     # 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:
 # 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'
+    mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
     mvn-params: '-f policy-agent'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
 # 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'
     mvn-params: '-f sdnc-a1-controller/northbound'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -86,7 +79,7 @@
           branch: master
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-release
     branch: master
     # maven release requires sigul which requires centos
       - '{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
+    mvn-params: '-Ddocker.skip=true -Dexec.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
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..ce4da6f
--- /dev/null
@@ -0,0 +1,60 @@
+---
+- 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
+    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'
+
index a832655..4e0c94b 100644 (file)
         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'
index 51d2447..ca0f539 100644 (file)
       - 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
@@ -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
index 6307700..43fd59d 100644 (file)
     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
     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'