Merge "Update build node for failing vnfrqts job"

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg
deleted file mode 100644 (file)
index d757901..0000000
--- a/jenkins-config/clouds/openstack/cattle/centos7-memcached-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=CentOS 7 - memcached -  - 260980909-9003
-LABELS=centos7-memcached-4c-4g
-HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg
deleted file mode 100644 (file)
index 11e0fbb..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-memcached-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - memcached -  - 211081010-10003
-LABELS=ubuntu1604-memcached-4c-4g
-HARDWARE_ID=v2-highcpu-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
new file mode 100644 (file)
index 0000000..5e19001
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+LABELS=ubuntu1804-docker-arm64-4c-2g
+HARDWARE_ID=lf-standard-2

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
new file mode 100644 (file)
index 0000000..5ece275
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - arm64 - 20200313-023920.944
+LABELS=ubuntu1804-docker-arm64-4c-4g
+HARDWARE_ID=lf-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
new file mode 100644 (file)
index 0000000..6d2f06e
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-memcached-4c-4g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 18.04 - memcached -  - 120380303-3010
+LABELS=ubuntu1804-memcached-4c-4g
+HARDWARE_ID=v2-highcpu-4

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 7b73388..c94118e 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -47,7 +47,7 @@
 #          settings: '{mvn-settings}'
 #          script:
 #            !include-raw-escape: 'build-aaf-docker-image.sh'
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #    project: 'aaf/authz'
 #    stream:
 #      - 'master':

diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml
index 68f6940..4bf9646 100644 (file)
--- a/jjb/aai/aai-graphgraph.yaml
+++ b/jjb/aai/aai-graphgraph.yaml
@@ -26,8 +26,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'aai-graphgraph-settings'
     files: '**'
     archive-artifacts: ''
@@ -41,21 +39,3 @@
     project: aai/graphgraph
     branch: master
 
-- project:
-    name: aai-graphgraph-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'aai/graphgraph'
-    project-name: 'aai-graphgraph'
-    branch: 'master'
-    mvn-settings: 'aai-sparky-be-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    mvn-version: 'mvn35'

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index a4ef267..ee14b23 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -64,7 +64,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: appc-deployment-info

diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index 8b2ec47..e5b29ba 100644 (file)
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -95,7 +95,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: ccsdk-apps-info

diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index b9cd8fa..aacfe89 100644 (file)
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -53,7 +53,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: ccsdk-distribution-clm

diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index 2a8436f..f8014bf 100644 (file)
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -34,7 +34,7 @@
     platforms:
       - centos-7
       - ubuntu-16.04
-      - ubuntu-16.04-arm64
+      - ubuntu-18.04-arm64
       - ubuntu-18.04
     templates: docker
 
@@ -52,8 +52,7 @@
     build-timeout: 90
 
     platforms:
-      - centos-7
-      - ubuntu-16.04
+      - ubuntu-18.04
     templates: memcached
 
 - project:
@@ -85,6 +84,5 @@
     build-node: centos7-builder-2c-1g
 
     platforms:
-      - ubuntu-16.04
       - ubuntu-18.04
     templates: helm

diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index c21ae21..ef105ff 100644 (file)
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -54,7 +54,7 @@
 #    mvn-settings: 'cli-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: cli-sonar

diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index ebf695c..71ca922 100644 (file)
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -42,7 +42,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+          build-node: 'ubuntu1804-docker-arm64-4c-2g'
     project: 'externalapi/nbi'
     stream:
       - 'master':

diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index b7b92fd..9b10ad6 100644 (file)
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -66,7 +66,7 @@
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -212,7 +212,7 @@
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -361,7 +361,7 @@
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'
@@ -513,7 +513,7 @@
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1604-docker-arm64-4c-2g'
+    build-node: 'ubuntu1804-docker-arm64-4c-2g'
     node: '{build-node}'
     recipients: ''
     java-version: 'openjdk11'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f4d101e..f5f3a1d 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -56,7 +56,7 @@
     name: '{project-name}-{stream}-{subproject}-lint'
     project-type: freestyle
     description: 'Job intended for running linters with Tox and Coala'
-    build-node: ubuntu1604-builder-2c-1g
+    build-node: ubuntu1804-builder-4c-4g
     node: '{build-node}'
 
     parameters:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
index 4ef1801..f0eab70 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
@@ -44,7 +44,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
index 82317ba..3f064c4 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
@@ -44,7 +44,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
index ba9cf5d..41855fc 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
@@ -42,7 +42,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
index a40fda1..90126a0 100644 (file)
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
@@ -41,7 +41,7 @@
 #    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 6e6b289..159f357 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -50,7 +50,7 @@
 #    mvn-settings: 'logging-analytics-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 
 - project:

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index ed611b8..3fc4d33 100644 (file)
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -50,7 +50,7 @@
 #    mvn-settings: 'msb-apigateway-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: msb-apigateway-sonar

diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index b38802b..cbe5505 100644 (file)
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -36,7 +36,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-discovery-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    project: 'msb/discovery'
 #    stream:
 #      - 'master':

diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index 270a557..11002ab 100644 (file)
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -51,7 +51,7 @@
 #            !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-azure-sonar

diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index 1883da9..c6f0e77 100644 (file)
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -56,7 +56,7 @@
 #            !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: multicloud-framework-multivimbroker-sonar

diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index f8cf56f..2995e7b 100644 (file)
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -48,7 +48,7 @@
 #    mvn-settings: 'multicloud-k8s-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: multicloud-k8s-info

diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index ba897bc..b2d2293 100644 (file)
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -51,7 +51,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #

diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 1bdc5b9..8192bf3 100644 (file)
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -91,7 +91,7 @@
 #          mvn-goals: 'install'
 #          script:
 #            !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
-#          build-node: ubuntu1604-docker-arm64-4c-2g
+#          build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #
@@ -160,7 +160,7 @@
     nexus-iq-namespace: 'onap-'
     project: multicloud/openstack
     project-name: 'multicloud-openstack'
-    build-node: ubuntu1604-memcached-4c-4g
+    build-node: ubuntu1804-memcached-4c-4g
     branch: 'master'
     mvn-settings: 'multicloud-openstack-settings'
 

diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml
index b94af56..a91a4b2 100644 (file)
--- a/jjb/optf/optf-has.yaml
+++ b/jjb/optf/optf-has.yaml
@@ -26,7 +26,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -36,7 +36,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-has-docker
@@ -79,7 +79,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'optf/has'
     project-name: 'optf-has'
     branch: 'master'

diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index b4884b7..2607b1f 100644 (file)
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -36,7 +36,7 @@
 
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-osdf-sonar
@@ -48,7 +48,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/osdf'
     project-name: 'optf-osdf'
     branch: 'master'
@@ -62,7 +62,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: optf/osdf
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'optf-osdf'
     stream:
       - 'master':

diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index d5c9d25..5688d1f 100644 (file)
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -44,12 +44,12 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-arm64-4c-2g
+          build-node: ubuntu1804-docker-arm64-4c-2g
           pattern: 'do_not_match_any_file'
       - '{project-name}-multiarch-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           project-name: 'policy-docker-arm64'
-          build-node: ubuntu1604-docker-arm64-4c-2g
+          build-node: ubuntu1804-docker-arm64-4c-2g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
           container-public-registry: 'docker.io'

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 924ea37..fc57249 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -66,5 +66,6 @@
     project-name: policy-gui
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: policy/gui
     branch: master

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index d5f183e..2bc95a3 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -16,7 +16,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
-          build-node: ubuntu1604-docker-arm64-4c-2g
+          build-node: ubuntu1804-docker-arm64-4c-2g
           pattern: 'do_not_match_any_file'
       - gerrit-maven-stage:
           sign-artifacts: true
@@ -28,7 +28,7 @@
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-docker-stage:
           project-name: 'policy-pap-arm64'
-          build-node: ubuntu1604-docker-arm64-4c-2g
+          build-node: ubuntu1804-docker-arm64-4c-2g
           maven-versions-plugin: true
           mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io'
           container-public-registry: 'docker.io'

diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml
index 735f98c..ae02400 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-ci.yaml
+++ b/jjb/sdc/sdc-dcae-d-ci.yaml
@@ -38,7 +38,7 @@
 #         docker-pom: 'pom.xml'
 #         mvn-profile: 'docker'
 #         mvn-params: '-DskipTests=true'
-#         build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#         build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #    project: 'sdc/dcae-d/ci'
 #    stream:
 #      - 'master':

diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
index 8aa4bf9..4828b40 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml
@@ -29,7 +29,7 @@
 #    project-name: 'sdc-dcae-d-dt-be-main-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true'
@@ -38,7 +38,7 @@
 #      - 'master':
 #          branch: 'master'
 #    mvn-settings: 'sdc-dcae-d-dt-be-main-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    files: '**'
 #    archive-artifacts: ''
 #    build-timeout: 60

diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml
index 0d91303..e95e2f9 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-dt.yaml
+++ b/jjb/sdc/sdc-dcae-d-dt.yaml
@@ -29,10 +29,10 @@
 #- project:
 #    name: sdc-dcae-d-dt-arm64
 #    project-name: 'sdc-dcae-d-dt-arm64'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'server,docker'
 #          mvn-params: '-DskipTests=true'

diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml
index b156afd..cf1b29d 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-fe.yaml
+++ b/jjb/sdc/sdc-dcae-d-fe.yaml
@@ -31,7 +31,7 @@
 #    project-name: 'sdc-dcae-d-fe-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true'

diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
index fc0fd42..d99aab5 100644 (file)
--- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
+++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml
@@ -35,7 +35,7 @@
 #        path: '.'
 #        pattern: '**'
 #    mvn-settings: 'sdc-dcae-d-tosca-lab-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-java-daily':
 #          mvn-params: '-Dmaven.test.skip=true'

diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
index 6507f4f..10f087a 100644 (file)
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ b/jjb/sdc/sdc-sdc-docker-base.yaml
@@ -44,7 +44,7 @@
 #    mvn-settings: 'sdc-sdc-docker-base-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 
 - project:

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index ca0408a..8adf120 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -53,7 +53,7 @@
 #    archive-artifacts: ''
 #    docker-pom: 'pom.xml'
 #    mvn-profile: docker
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    maven-version: 'mvn35'
 #
 - project:

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 70d2c22..8b30314 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -66,7 +66,7 @@
 #    project-name: 'sdc-arm64'
 #    jobs:
 #      - '{project-name}-{stream}-docker-version-java-daily':
-#          build-node: 'ubuntu1604-docker-arm64-4c-2g'
+#          build-node: 'ubuntu1804-docker-arm64-4c-2g'
 #          docker-pom: 'pom.xml'
 #          mvn-profile: 'docker'
 #          mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/'

diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml
index 39a8977..ed3d1fc 100644 (file)
--- a/jjb/sdnc/sdnc-apps.yaml
+++ b/jjb/sdnc/sdnc-apps.yaml
@@ -79,7 +79,7 @@
 #    mvn-settings: 'sdnc-apps-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-apps-clm

diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index c39db40..ab9009d 100644 (file)
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -51,7 +51,7 @@
 #    mvn-settings: 'sdnc-oam-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 
 - project:
     name: sdnc-oam-clm

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index f93a1fa..7d0eb5d 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -63,8 +63,7 @@
     project-name: 'testsuite'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint':
-          build-node: ubuntu1804-builder-4c-4g
+      - '{project-name}-{stream}-{subproject}-lint'
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index ee8356b..cc1a04b 100644 (file)
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -23,6 +23,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'

diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index cc8ba89..871876e 100644 (file)
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -48,7 +48,7 @@
 #    mvn-settings: 'vid-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: vid-sonar

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 8ce93b7..291011c 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -44,7 +44,7 @@
 #      - 'master':
 #          branch: 'master'
 #    mvn-settings: 'vnfsdk-dovetail-integration-settings'
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #    jobs:
 #      - '{project-name}-{stream}-docker-java-daily':
 #          docker-pom: 'pom.xml'

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index d94f8cb..58a45d1 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -51,7 +51,7 @@
 #    mvn-settings: 'vnfsdk-refrepo-settings'
 #    files: '**'
 #    archive-artifacts: ''
-#    build-node: ubuntu1604-docker-arm64-4c-2g
+#    build-node: ubuntu1804-docker-arm64-4c-2g
 #
 - project:
     name: vnfsdk-refrepo-sonar

diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
index d54746f..2267a25 100644 (file)
--- a/packer/provision/local-docker.yaml
+++ b/packer/provision/local-docker.yaml
@@ -116,6 +116,8 @@
           - make
           - sshuttle
           - netcat
+          - nodejs-dev
+          - libssl1.0-dev
           - libssl-dev
           - libffi-dev
           - xmlstarlet
@@ -128,11 +130,19 @@
           - crudini
           - maven
           - python-ncclient
-          - nodejs-dev
-          - node-gyp
           - nodejs
           - npm
         update_cache: yes
+        state: fixed
+      become: true
+      when: ansible_distribution == 'Ubuntu'
+
+    - name: Install npm addon packages
+      apt:
+        name:
+          - node-gyp
+        update_cache: yes
+        state: fixed
       become: true
       when: ansible_distribution == 'Ubuntu'
 

diff --git a/packer/vars/ubuntu-18.04-arm64.json b/packer/vars/ubuntu-18.04-arm64.json
new file mode 100644 (file)
index 0000000..6b8b2b5
--- /dev/null
+++ b/packer/vars/ubuntu-18.04-arm64.json
@@ -0,0 +1,10 @@
+{
+  "arch": "arm64",
+  "base_image": "Ubuntu 18.04 LTS (arm64) [2020-02-18]",
+  "cloud_user_data": "common-packer/provision/ubuntu-user_data.sh",
+  "distro": "Ubuntu 18.04",
+  "flavor": "lf-standard-1",
+  "source_ami_filter_name": "*ubuntu*18.04*",
+  "source_ami_filter_owner": "099720109477",
+  "ssh_user": "ubuntu"
+}