Merge "netconf-pnp-simulator: add IT using ncclient and tox-docker"

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/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index a3fd2ed..eec174a 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
@@ -72,7 +72,7 @@
     branch: 'master'
     mvn-settings: 'dcaegen2-services-settings'
     mvn-params: '-f components/bbs-event-processor/pom.xml'
-    mvn-goals: 'clean install'
+    mvn-goals: 'clean install -Ddockerfile.skip'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
 - project:

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-templates.yaml b/jjb/integration/integration-templates.yaml
index 0cf19bc..f4d101e 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -56,7 +56,8 @@
     name: '{project-name}-{stream}-{subproject}-lint'
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1604-builder-2c-1g
+    node: '{build-node}'
 
     parameters:
       - lf-infra-parameters:

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 71296e4..70d2c22 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -53,6 +53,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'frankfurt':
+          branch: 'frankfurt'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''