From 0d27ccf66a76f6a7f6555be90104d4918a1a7368 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 12 Mar 2020 21:13:14 -0700 Subject: [PATCH] Migrate to ARM Ubuntu18.04 node Ubuntu 16.04 still has SSH and Kernel issues. Migrating to Ubuntu18.04 since we have a good instance now. TODO: Disable Ubuntu16.04 arm nodes. - Currently Ubuntu18.04 arm nodes are under more test. - No additional costs since no job is using 16.04 arm nodes. - Once confirmed, these will be disabled. Change-Id: I1ef6dfc04aa6e85531f824e24ad517137a7080ca Issue-ID: CIMAN-33 Signed-off-by: Jessica Wagantall --- .../clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg | 3 +++ .../clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg | 3 +++ jjb/aaf/aaf-authz.yaml | 2 +- jjb/appc/appc-deployment.yaml | 2 +- jjb/ccsdk/apps.yaml | 2 +- jjb/ccsdk/distribution.yaml | 2 +- jjb/cli/cli.yaml | 2 +- jjb/externalapi/externalapi-nbi.yaml | 2 +- jjb/integration/integration-templates-csit.yaml | 8 ++++---- .../logging-analytics-pomba-pomba-aai-context-builder.yaml | 2 +- ...g-analytics-pomba-pomba-network-discovery-context-builder.yaml | 2 +- .../logging-analytics-pomba-pomba-sdc-context-builder.yaml | 2 +- .../logging-analytics-pomba-pomba-sdnc-context-builder.yaml | 2 +- jjb/logging-analytics/logging-analytics.yaml | 2 +- jjb/msb/msb-apigateway.yaml | 2 +- jjb/msb/msb-discovery.yaml | 2 +- jjb/multicloud/multicloud-azure-java.yaml | 2 +- jjb/multicloud/multicloud-framework-java.yaml | 2 +- jjb/multicloud/multicloud-k8s.yaml | 2 +- jjb/multicloud/multicloud-openstack-vmware-java.yaml | 2 +- jjb/multicloud/multicloud-openstack.yaml | 2 +- jjb/policy/policy-docker-base-common.yaml | 4 ++-- jjb/policy/policy-pap.yaml | 4 ++-- jjb/sdc/sdc-dcae-d-ci.yaml | 2 +- jjb/sdc/sdc-dcae-d-dt-be-main.yaml | 4 ++-- jjb/sdc/sdc-dcae-d-dt.yaml | 4 ++-- jjb/sdc/sdc-dcae-d-fe.yaml | 2 +- jjb/sdc/sdc-dcae-d-tosca-lab.yaml | 2 +- jjb/sdc/sdc-sdc-docker-base.yaml | 2 +- jjb/sdc/sdc-sdc-workflow-designer.yaml | 2 +- jjb/sdc/sdc.yaml | 2 +- jjb/sdnc/sdnc-apps.yaml | 2 +- jjb/sdnc/sdnc-oam.yaml | 2 +- jjb/vid/vid.yaml | 2 +- jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml | 2 +- jjb/vnfsdk/vnfsdk-refrepo.yaml | 2 +- 36 files changed, 47 insertions(+), 41 deletions(-) create mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-2g.cfg create mode 100644 jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-arm64-4c-4g.cfg 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 index 000000000..5e1900178 --- /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 index 000000000..5ece27518 --- /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/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 7b73388af..c94118e6b 100644 --- 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/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index a4ef267b8..ee14b2379 100644 --- 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 8b2ec47b0..e5b29bab2 100644 --- 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 b9cd8faba..aacfe89dc 100644 --- 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/cli/cli.yaml b/jjb/cli/cli.yaml index c21ae21fc..ef105ffab 100644 --- 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 ebf695c76..71ca922b9 100644 --- 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 b7b92fde5..9b10ad65a 100644 --- 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/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index 4ef180159..f0eab70c1 100644 --- 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 82317ba6c..3f064c4ef 100644 --- 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 ba9cf5d30..41855fc17 100644 --- 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 a40fda157..90126a0c5 100644 --- 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 6e6b2893a..159f3572d 100644 --- 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 ed611b84c..3fc4d3326 100644 --- 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 b38802b9d..cbe550524 100644 --- 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 270a557ce..11002abeb 100644 --- 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 1883da9a4..c6f0e77b7 100644 --- 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 f8cf56fff..2995e7bfd 100644 --- 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 ba897bce8..b2d22932c 100644 --- 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 6d02177d8..8192bf3c2 100644 --- 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: '' # diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index d5c9d25b8..5688d1fd0 100644 --- 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-pap.yaml b/jjb/policy/policy-pap.yaml index d5f183efe..2bc95a325 100644 --- 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 735f98ca0..ae024000b 100644 --- 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 8aa4bf939..4828b4075 100644 --- 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 0d9130358..e95e2f93f 100644 --- 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 b156afdfa..cf1b29d6a 100644 --- 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 fc0fd4297..d99aab52a 100644 --- 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 6507f4f25..10f087abd 100644 --- 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 ca0408a24..8adf12063 100644 --- 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 70d2c221d..8b30314e9 100644 --- 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 39a89779f..ed3d1fc53 100644 --- 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 c39db4017..ab9009d72 100644 --- 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/vid/vid.yaml b/jjb/vid/vid.yaml index cc8ba89f6..871876e75 100644 --- 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 8ce93b7ae..291011cab 100644 --- 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 d94f8cba3..58a45d153 100644 --- 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 -- 2.16.6