summaryrefslogtreecommitdiffstats
path: root/jjb/vnfsdk
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/vnfsdk')
-rw-r--r--jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml8
-rw-r--r--jjb/vnfsdk/vnfsdk-functest.yaml6
-rw-r--r--jjb/vnfsdk/vnfsdk-pkgtools-python.yaml4
-rw-r--r--jjb/vnfsdk/vnfsdk-refrepo.yaml13
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml6
-rw-r--r--jjb/vnfsdk/vnfsdk-ves-agent.yaml6
6 files changed, 21 insertions, 22 deletions
diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 291011cab..5c7716f25 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -21,7 +21,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-merge-java'
@@ -31,7 +31,7 @@
docker-pom: 'pom.xml'
mvn-profile: 'docker'
mvn-params: '-Dmaven.test.skip=true'
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
#- project:
# name: vnfsdk-dovetail-integration-arm64
# project-name: 'vnfsdk-dovetail-integration-arm64'
@@ -56,7 +56,7 @@
jobs:
- gerrit-tox-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/dovetail-integration'
project-name: 'vnfsdk-dovetail-integration'
branch: 'master'
@@ -80,6 +80,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/dovetail-integration
project-name: 'vnfsdk-dovetail-integration'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-dovetail-integration-settings'
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 3a29d4136..57e12fc19 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -17,7 +17,7 @@
mvn-settings: 'vnfsdk-functest-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-functest-sonar
@@ -29,7 +29,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: 'vnfsdk/functest'
project-name: 'vnfsdk-functest'
branch: 'master'
@@ -53,6 +53,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/functest
project-name: 'vnfsdk-functest'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-functest-settings'
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index 7b2a77312..6d22310e6 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -14,7 +14,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vnfsdk-pkgtools-settings'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{subproject}-python-staging-{stream}'
@@ -25,7 +25,7 @@
jobs:
- gerrit-tox-sonar
cron: '@daily'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
project: 'vnfsdk/pkgtools'
project-name: 'vnfsdk-pkgtools'
branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 58a45d153..d43564192 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -10,10 +10,9 @@
build-node: centos7-builder-4c-4g
maven-versions-plugin: true
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: centos7-docker-8c-8g
maven-versions-plugin: true
- mvn-params: '-f vnfmarket-be/deployment/docker/docker-refrepo/pom.xml -P docker -Dmaven.test.skip=true'
- mvn-pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml'
+ mvn-goals: 'clean package -Pdocker'
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
- '{project-name}-gerrit-release-jobs':
@@ -22,7 +21,7 @@
# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
# mvn-profile: 'docker'
# mvn-params: '-Dmaven.test.skip=true'
-# build-node: ubuntu1604-docker-8c-8g
+# build-node: ubuntu1804-docker-8c-8g
project: 'vnfsdk/refrepo'
stream:
- 'master':
@@ -30,7 +29,7 @@
mvn-settings: 'vnfsdk-refrepo-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
#- project:
# name: vnfsdk-refrepo-arm64
@@ -63,7 +62,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: 'vnfsdk/refrepo'
project-name: 'vnfsdk-refrepo'
branch: 'master'
@@ -87,6 +86,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/refrepo
project-name: 'vnfsdk-refrepo'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-refrepo-settings'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index f5e7f43c2..3d5a602a1 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -18,7 +18,7 @@
mvn-settings: 'vnfsdk-validation-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-validation-sonar
@@ -30,7 +30,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: 'vnfsdk/validation'
project-name: 'vnfsdk-validation'
branch: 'master'
@@ -54,6 +54,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/validation
project-name: 'vnfsdk-validation'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-validation-settings'
diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index b0a6a2cd0..7d4191456 100644
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -31,7 +31,7 @@
mvn-settings: 'vnfsdk-ves-agent-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: vnfsdk-ves-agent-sonar
@@ -54,7 +54,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: 'vnfsdk/ves-agent'
project-name: 'vnfsdk-ves-agent'
branch: 'master'
@@ -80,6 +80,6 @@
nexus-iq-namespace: 'onap-'
project: vnfsdk/ves-agent
project-name: 'vnfsdk-ves-agent'
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
branch: 'master'
mvn-settings: 'vnfsdk-ves-agent-settings'