Merge "Adding sonar job for hv-ves"

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
index 111d8a7..fbd2831 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898
 LABELS=ubuntu1604-builder-2c-1g
 HARDWARE_ID=v2-highcpu-2

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
index cb9b277..7f2ebe8 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898
 LABELS=ubuntu1604-builder-4c-2g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
index 1180443..2bf93ca 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898
 LABELS=ubuntu1604-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
index 2d4bd37..f28c24e 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20191007-191710.199
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200204-095421.898
 LABELS=ubuntu1604-builder-8c-8g
 HARDWARE_ID=v2-highcpu-8

diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 6f73acc..92c5386 100644 (file)
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -7,12 +7,21 @@
     java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-merge-java':
+         build-node: 'ubuntu1604-docker-v1-8c-8g'
+         docker-pom: 'pom.xml'
+         mvn-profile: 'docker'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-docker-8c-8g
+          build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
           mvn-pom: 'certService/pom.xml'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-v1-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -DskipTests=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
 

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 497249a..764aba8 100644 (file)
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -11,6 +11,14 @@
           cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1604-docker-8c-8g
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+          mvn-params: '-Dmaven.test.skip=true -P docker'
+          maven-version: "mvn35"
+          maven-versions-plugin: true
+          cron: '@daily'
 
     project: 'ccsdk/dashboard'
     stream:

diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index ba2f74e..6305828 100644 (file)
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -5,15 +5,22 @@
     # The purpose of this job template is to run:
     # 1. make build
     #
-    # golangver can be set to golang110 or golang111
+    # golangver can be set to golang110, golang111 or golang112
     # depending on what version is needed by the project
     # default is golang110
     #
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
+    #
+    # Optional Variables:
+    #     script:    build script to execute
+    #     pattern:   ant file-path pattern relative to the workspace used to
+    #                trigger the job
 
     name: '{project-name}-{stream}-verify-golang'
     path: '$WORKSPACE'
+    pattern: '**'
+    script: ''
     golangver: 'golang110'
 
     project-type: freestyle
@@ -47,7 +54,7 @@
           server: '{server-name}'
           project: '{project}'
           branch: '{branch}'
-          files: '**'
+          files: '{pattern}'
 
     builders:
       - lf-infra-pre-build
@@ -58,6 +65,7 @@
           #!/bin/bash
           cd $WORKSPACE/{path}
           make build
+      - shell: '{script}'
 
     publishers:
       - infra-shiplogs:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 677e7e0..aeb793f 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -59,9 +59,9 @@
       - shell: |
           #!/bin/bash
           set -ex # Fail build if any setup step fails
-          add-apt-repository --yes ppa:tiagohillebrandt/vagrant
-          apt update
-          apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
+          sudo add-apt-repository --yes ppa:tiagohillebrandt/vagrant
+          sudo apt update
+          sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant
           vagrant plugin install vagrant-libvirt
           vagrant plugin install vagrant-disksize
           mkdir -p ~/.ssh

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 31bda6e..453dc75 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -43,3 +43,25 @@
 
     jobs:
       - '{project-name}-{stream}-verify-vagrantfile'
+
+- project:
+    name: integration-verify-golang
+    project-name: 'integration'
+    project: 'integration'
+    golangver: 'golang112'
+    mvn-settings: 'integration-settings'
+    archive-artifacts: ''
+    build-node: ubuntu1604-builder-2c-1g
+    jobs:
+      - '{project-name}-{stream}-verify-golang':
+          script: '{build_script}'
+    path: 'test/security/k8s'
+    pattern: '{path}/**'
+    stream:
+      - 'master':
+          branch: 'master'
+    build_script: |
+        #!/bin/bash
+        set -ex # Fail build if any setup step fails
+        cd test/security/k8s
+        make test

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 5d936a8..91df1b5 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -52,6 +52,7 @@
 #    archive-artifacts: ''
 #    build-node: ubuntu1604-docker-arm64-4c-2g
 #
+
 - project:
     name: logging-analytics-sonar
     jobs:
@@ -72,43 +73,24 @@
 
 - project:
     name: logging-analytics-pylog
-    project-name: 'logging-analytics-pylog'
+    project-name: 'logging-analytics'
     project: 'logging-analytics'
     python-version: python3
+    tox-dir: 'pylog/'
+    tox-envs: ''
     stream:
       - 'master':
           branch: 'master'
+    build-node: ubuntu1604-builder-4c-4g
     mvn-settings: 'logging-analytics-settings'
     subproject:
       - 'pylog':
-          pom: 'pylog/pom.xml'
           pattern: 'pylog/**'
-          tox-dir: pylog/
-          tox-envs: ''
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
-
-- project:
-    name: logging-analytics-pylog-python
-    project-name: 'logging-analytics-pylog'
-    project: 'logging-analytics'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'logging-analytics-settings'
-    build-node: 'ubuntu1604-builder-4c-4g'
-    subproject:
-      - 'pylog':
           path: 'pylog'
-          pattern: 'pylog/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
 
 - project:
     name: logging-analytics-info

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 8ec46fc..924ea37 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -7,13 +7,13 @@
       - '{project-name}-{stream}-merge-java':
           docker-pom: 'pom.xml'
           mvn-params: '-P docker'
-          build-node: ubuntu1604-docker-4c-4g
+          build-node: ubuntu1604-docker-8c-8g
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-4c-4g
+          build-node: ubuntu1604-docker-8c-8g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true'
           container-public-registry: 'nexus3.onap.org:10001'