Merge "Exclude Robotframework linter trigger"

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg
index b04a0a5..aa10741 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-2g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20200305-202810.251
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20200310-195234.343
 LABELS=ubuntu1604-docker-arm64-4c-2g
 HARDWARE_ID=lf-standard-2

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg
index 440c37d..e7629a8 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-arm64-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20200305-202810.251
+IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20200310-195234.343
 LABELS=ubuntu1604-docker-arm64-4c-4g
 HARDWARE_ID=lf-standard-4

diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index d292bf4..2a8436f 100644 (file)
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -15,7 +15,6 @@
     platforms:
       - centos-7
       - ubuntu-16.04
-      - ubuntu-16.04-arm64
       - ubuntu-18.04
     templates: builder
 
@@ -87,4 +86,5 @@
 
     platforms:
       - ubuntu-16.04
+      - ubuntu-18.04
     templates: helm

diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 12ce9a3..3d0f170 100644 (file)
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -55,6 +55,7 @@
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
+    concurrent: true
 
     scm:
       - gerrit-trigger-scm:

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 2c2d89f..17b6083 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -79,6 +79,7 @@
     docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
     docker-root: test/mocks/netconf-pnp-simulator/engine
     container-tag-method: yaml-file
+    post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh
     build-node: centos7-docker-8c-8g
     build-timeout: 20
     jobs:

diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index a19dcd6..917ff29 100644 (file)
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -18,6 +18,8 @@
       - '{project-name}-{stream}-docker-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
           build-node: ubuntu1604-docker-8c-8g
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'