summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/ccsdk/cds.yaml2
-rw-r--r--jjb/integration/integration-templates.yaml2
-rw-r--r--jjb/integration/integration.yaml2
-rw-r--r--jjb/integration/simulators/integration-ran-simulator.yaml9
-rw-r--r--jjb/multicloud/multicloud-azure-java.yaml6
-rw-r--r--jjb/multicloud/multicloud-azure-python.yaml2
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml8
-rw-r--r--jjb/multicloud/multicloud-framework-python.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml8
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-python.yaml2
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml12
11 files changed, 33 insertions, 22 deletions
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index d8395bab5..61435e740 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -26,6 +26,8 @@
stream:
- 'master':
branch: 'master'
+ - 'elalto':
+ branch: 'elalto'
- 'frankfurt':
branch: 'frankfurt'
mvn-settings: 'ccsdk-cds-settings'
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f5f3a1d8d..7d9ffed21 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -8,7 +8,7 @@
name: '{project-name}-{stream}-verify-vagrantfile'
project-type: freestyle
description: 'Job intended for validating vagrantfiles'
- node: ubuntu1604-builder-2c-1g
+ node: ubuntu1804-builder-4c-4g
parameters:
- lf-infra-parameters:
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 17b608363..4f95f5e02 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -49,7 +49,7 @@
golangver: 'golang112'
mvn-settings: 'integration-settings'
archive-artifacts: ''
- build-node: ubuntu1604-builder-2c-1g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-verify-golang':
script: '{build_script}'
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
new file mode 100644
index 000000000..e639f2fdf
--- /dev/null
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -0,0 +1,9 @@
+---
+- project:
+ name: integration-simulators-ran-simulator-info
+ project-name: integration-simulators-ran-simulator
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/simulators/ran-simulator
+ branch: master
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index 11002abeb..da9827bc0 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -21,7 +21,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-goals: install
mvn-params: '-P docker'
maven-versions-plugin: true
@@ -29,7 +29,7 @@
container-staging-registry: 'nexus3.onap.org:10003'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-2g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: multicloud-azure-arm64-java
@@ -63,7 +63,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: 'multicloud/azure'
project-name: 'multicloud-azure'
branch: 'master'
diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml
index 5066a4cca..8aec29b5e 100644
--- a/jjb/multicloud/multicloud-azure-python.yaml
+++ b/jjb/multicloud/multicloud-azure-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'multicloud-azure-settings'
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
subproject:
- 'azure':
path: 'azure'
diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml
index c6f0e77b7..323311824 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -20,7 +20,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-goals: install
mvn-params: '-P docker'
maven-versions-plugin: true
@@ -34,7 +34,7 @@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: multicloud-framework-arm64-java
@@ -68,7 +68,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: 'multicloud/framework'
project-name: 'multicloud-framework-multivimbroker'
branch: 'master'
@@ -98,7 +98,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: 'multicloud/framework'
project-name: 'multicloud-framework-artifactbroker'
branch: 'master'
diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml
index c8b4b35ad..d81081a1d 100644
--- a/jjb/multicloud/multicloud-framework-python.yaml
+++ b/jjb/multicloud/multicloud-framework-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'multicloud-framework-settings'
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
subproject:
- 'multivimbroker':
path: 'multivimbroker'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index b2d22932c..4dad5cb27 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -17,7 +17,7 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-goals: install
mvn-params: '-P docker'
maven-versions-plugin: true
@@ -31,7 +31,7 @@
build-node: centos7-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: multicloud-openstack-vmware-arm64-java
@@ -65,7 +65,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: 'multicloud/openstack/vmware'
project-name: 'multicloud-openstack-vmware'
branch: 'master'
@@ -80,7 +80,7 @@
nexus-iq-namespace: 'onap-'
project: multicloud/openstack/vmware
project-name: 'multicloud-openstack-vmware'
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
branch: 'master'
mvn-settings: 'multicloud-openstack-vmware-settings'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
index a23ecf3d4..973ca5162 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml
@@ -7,7 +7,7 @@
- 'master':
branch: 'master'
mvn-settings: 'multicloud-openstack-vmware-settings'
- build-node: 'ubuntu1604-builder-4c-4g'
+ build-node: 'ubuntu1804-builder-4c-4g'
subproject:
- 'vio':
path: 'vio'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 8192bf3c2..764748fd1 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -106,7 +106,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: 'multicloud/openstack'
project-name: 'multicloud-openstack-windriver'
branch: 'master'
@@ -125,7 +125,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: 'multicloud/openstack'
project-name: 'multicloud-openstack-pike'
branch: 'master'
@@ -144,7 +144,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: 'multicloud/openstack'
project-name: 'multicloud-openstack-starlingx'
branch: 'master'
@@ -174,7 +174,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: 'multicloud/openstack'
project-name: 'multicloud-openstack-fcaps'
branch: 'master'
@@ -193,7 +193,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: 'multicloud/openstack'
# project-name: 'multicloud-openstack-lenovo'
# branch: 'master'
@@ -212,7 +212,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: 'multicloud/openstack'
project-name: 'multicloud-openstack-hpa'
branch: 'master'