Merge "Update builder nodes"

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.yaml b/jjb/integration/integration.yaml
index 31bda6e..e9be0e2 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 {path}
+        make test

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'