Merge "Set up CICD for QP Driver"

diff --git a/docker/bldr-alpine3-go/Dockerfile b/docker/bldr-alpine3-go/Dockerfile
index a1e31f0..15cf91d 100644 (file)
--- a/docker/bldr-alpine3-go/Dockerfile
+++ b/docker/bldr-alpine3-go/Dockerfile
@@ -16,14 +16,14 @@
 # ==================================================================================
 
 # Has:
-# golang 1.13.7
+# golang 1.13.8
 # alpine 3.11
 # rmr 1.13.1
 # Installing this version of rmr also pulls in nng
 
 # install a well known working rmr
-FROM golang:1.13.7-alpine3.11
-RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git
+FROM golang:1.13.8-alpine3.11
+RUN apk update && apk add autoconf automake build-base cmake libtool ninja pkgconfig git sudo
 RUN git clone --branch 1.13.1 https://gerrit.oran-osc.org/r/ric-plt/lib/rmr \
     && cd rmr \
     && mkdir .build; cd .build \

diff --git a/docker/bldr-alpine3-go/container-tag.yaml b/docker/bldr-alpine3-go/container-tag.yaml
index ef8d069..4f62d1e 100644 (file)
--- a/docker/bldr-alpine3-go/container-tag.yaml
+++ b/docker/bldr-alpine3-go/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1-rmr1.13.1
+tag: 2-rmr1.13.1

diff --git a/docker/bldr-alpine3/Dockerfile b/docker/bldr-alpine3/Dockerfile
index 499e167..9fe6f98 100644 (file)
--- a/docker/bldr-alpine3/Dockerfile
+++ b/docker/bldr-alpine3/Dockerfile
@@ -40,6 +40,7 @@ RUN apk update && apk add \
   ninja \
   pkgconfig \
   python-dev \
+  sudo \
   git \
   go
 

diff --git a/docker/bldr-ubuntu18-c-go/Dockerfile b/docker/bldr-ubuntu18-c-go/Dockerfile
index 3d21db2..d9f1fe5 100644 (file)
--- a/docker/bldr-ubuntu18-c-go/Dockerfile
+++ b/docker/bldr-ubuntu18-c-go/Dockerfile
@@ -36,6 +36,7 @@ RUN apt-get update && apt-get install -y \
     python-dev \
     pkg-config \
     software-properties-common \
+    sudo \
     wget \
     zlib1g \
     zlib1g-dev \
@@ -47,21 +48,28 @@ WORKDIR /tmp
 # Install go versions in /opt
 RUN mkdir -p /opt/go
 
-ARG g12="1.12.16"
+ARG g12="1.12.17"
 RUN wget -nv https://dl.google.com/go/go${g12}.linux-amd64.tar.gz \
     && tar -xf go${g12}.linux-amd64.tar.gz \
     && mv go /opt/go/1.12 \
     && rm -f go*.gz
 
-ARG g13="1.13.7"
+ARG g13="1.13.8"
 RUN wget -nv https://dl.google.com/go/go${g13}.linux-amd64.tar.gz \
     && tar -xf go${g13}.linux-amd64.tar.gz \
     && mv go /opt/go/1.13 \
     && rm -f go*.gz
 
+ARG g14="1.14"
+RUN wget -nv https://dl.google.com/go/go${g14}.linux-amd64.tar.gz \
+    && tar -xf go${g14}.linux-amd64.tar.gz \
+    && mv go /opt/go/1.14 \
+    && rm -f go*.gz
+
 ENV GOPATH=/root/go
 # Default path has go version 1.12.x
 # Use /opt/go/1.13/bin for version 1.13.x
+# Use /opt/go/1.14/bin for version 1.14.x
 ENV PATH=$PATH:/opt/go/1.12/bin:$GOPATH/bin
 
 # This installs go-acc to GOPATH

diff --git a/docker/bldr-ubuntu18-c-go/container-tag.yaml b/docker/bldr-ubuntu18-c-go/container-tag.yaml
index 4706dbf..0bffd9f 100644 (file)
--- a/docker/bldr-ubuntu18-c-go/container-tag.yaml
+++ b/docker/bldr-ubuntu18-c-go/container-tag.yaml
@@ -1,4 +1,4 @@
 # Not feasible to show all the software versions
 # here so just use a counter plus the base image
 ---
-tag: 4-u18.04-nng
+tag: 5-u18.04-nng

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g
index ebebda6..3021ff5 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190927-151252.150
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039
 VOLUME_SIZE=20
 HARDWARE_ID=v2-highcpu-1

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg
index a2a12fb..62407da 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200123-164248.786
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200317-104237.628
 HARDWARE_ID=v2-standard-2
 VOLUME_SIZE=200

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg
index d1735c5..00cb8b3 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200123-164248.786
+IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200317-104237.628
 HARDWARE_ID=v2-standard-2
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 737d268..180dddc 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -5,7 +5,7 @@ CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=sjc1
 
 # Default Template Configuration
-IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190419-213159.723
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039
 VOLUME_SIZE=20
 HARDWARE_ID=v2-highcpu-1
 NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
index f275961..38b299b 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190926-151758.548
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675
 LABELS=ubuntu1804-builder-2c-2g
 HARDWARE_ID=v2-highcpu-2
 VOLUME_SIZE=10

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 854fa33..17d13d8 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190926-151758.548
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=10

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 c0a59b4..3df02e5 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 - 20200227-162610.751
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200317-104132.496
 LABELS=ubuntu1804-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=20

diff --git a/jjb/ric-plt-alarm-go/build-alarm-go-ubuntu.sh b/jjb/ric-plt-alarm-go/build-alarm-go-ubuntu.sh
deleted file mode 100755 (executable)
index cd32d65..0000000
--- a/jjb/ric-plt-alarm-go/build-alarm-go-ubuntu.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Installs NNG then run a build script in the repository
-# Assumes ubuntu - uses apt-get
-
-echo "--> build-alarm-go-ubuntu.sh"
-
-echo "Install packages"
-sudo apt-get install -y cmake ninja-build
-
-# NNG repo is not frequently tagged so it's pinned to a commit hash.
-# This commit provides fix to the proxy-reconnect
-# bug that we identified:  https://github.com/nanomsg/nng/issues/970
-echo "Clone and build NNG"
-git clone https://github.com/nanomsg/nng.git
-(cd nng \
-    && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \
-    && mkdir build \
-    && cd build \
-    && cmake3 -DBUILD_SHARED_LIBS=1 -G Ninja .. \
-    && ninja-build \
-    && sudo ninja-build install)
-
-cmd="./adapter/build_adapter.sh"
-echo "INFO: invoking build script: $cmd"
-$cmd
-
-echo "--> build-alarm-go-ubuntu.sh ends"

diff --git a/jjb/ric-plt-alarm-go/prescan-alarm-go-ubuntu.sh b/jjb/ric-plt-alarm-go/prescan-alarm-go-ubuntu.sh
new file mode 100755 (executable)
index 0000000..e0abfc4
--- /dev/null
+++ b/jjb/ric-plt-alarm-go/prescan-alarm-go-ubuntu.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Installs NNG then runs a build script in the repository
+# Assumes ubuntu - uses apt-get
+
+echo "--> prescan-alarm-go-ubuntu.sh"
+
+set -ex
+
+sudo apt-get install -y cmake ninja-build
+
+# NNG repo is not frequently tagged so it's pinned to a commit hash.
+# This commit repairs bug https://github.com/nanomsg/nng/issues/970
+git clone https://github.com/nanomsg/nng.git
+(cd nng \
+    && git checkout e618abf8f3db2a94269a79c8901a51148d48fcc2 \
+    && mkdir build \
+    && cd build \
+    && cmake -DBUILD_SHARED_LIBS=1 -G Ninja .. \
+    && ninja \
+    && sudo ninja install)
+
+# build script must start in this subdir
+cd adapter
+bash build_adapter_ubuntu.sh
+
+echo "--> prescan-alarm-go-ubuntu.sh ends"

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 c82dc54..a832655 100644 (file)
--- a/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
+++ b/jjb/ric-plt-alarm-go/ric-plt-alarm-go.yaml
@@ -27,7 +27,7 @@
     <<: *alarm_go_common
     name: ric-plt-alarm-go-docker
     # image name
-    docker-name: 'o-ran-sc/ric-plt-alarm-go'
+    docker-name: 'o-ran-sc/ric-plt-alarmadapter'
     # source of docker tag
     container-tag-method: yaml-file
     container-tag-yaml-dir: adapter
@@ -46,7 +46,7 @@
     # docker-enabled nodes have golang
     # build script needs ubuntu
     build-node: ubuntu1804-docker-4c-4g
-    sonar-prescan-script: !include-raw-escape: build-alarm-go-ubuntu.sh
+    sonar-prescan-script: !include-raw-escape: prescan-alarm-go-ubuntu.sh
     sonar-project-file: ""
     # use sonarcloud values from defaults.yaml
     sonar-properties: |
@@ -62,7 +62,7 @@
         # Source
         sonar.sources=.
         # Unit tests
-        sonar.go.coverage.reportPaths=coverage.xml
+        sonar.go.coverage.reportPaths=adapter/cover.out,alarm/cover.out
         # Inclusions
         sonar.inclusions=**/*.go
         # Exclusions