diff options
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg | 3 | ||||
| -rw-r--r-- | jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg | 3 | ||||
| -rw-r--r-- | jjb/appc/appc-parent.yaml | 2 | ||||
| -rw-r--r-- | jjb/global-defaults.yaml | 2 | ||||
| -rw-r--r-- | jjb/lab/lab-templates.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc-dcae-d-dt.yaml | 4 | ||||
| -rw-r--r-- | jjb/sdc/sdc-dcae-d-fe.yaml | 4 |
7 files changed, 7 insertions, 13 deletions
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg deleted file mode 100644 index 9018cf4bf..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 -LABELS=ubuntu1604-builder-2c-1g -HARDWARE_ID=v2-highcpu-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg deleted file mode 100644 index 610a33d7d..000000000 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg +++ /dev/null @@ -1,3 +0,0 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - builder - x86_64 - 20200220-190142.855 -LABELS=ubuntu1604-builder-4c-2g -HARDWARE_ID=v2-highcpu-4 diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 897028cb3..2ada1b0b0 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -24,7 +24,7 @@ branch: 'master' mvn-settings: 'appc-parent-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g - project: name: appc-parent-info diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 1590d0134..74479f299 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -38,7 +38,7 @@ # Timeout in minutes build-timeout: 90 - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g archive-artifacts: '' diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml index ff7a59d40..234d1fc86 100644 --- a/jjb/lab/lab-templates.yaml +++ b/jjb/lab/lab-templates.yaml @@ -4,7 +4,7 @@ description: '{job-desc}' disabled: false project-type: freestyle - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g properties: - lf-infra-properties: diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 2a14df817..6531c545a 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -2,7 +2,7 @@ - project: name: sdc-dcae-d-dt project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -73,7 +73,7 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/dt project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'sdc-dcae-d-dt-settings' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 3923a154e..f5693cb28 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -2,7 +2,7 @@ - project: name: sdc-dcae-d-fe project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -72,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/fe project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'sdc-dcae-d-fe-settings' |