summaryrefslogtreecommitdiffstats
path: root/jjb/appc
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/appc')
-rw-r--r--jjb/appc/appc-cdt.yaml4
-rw-r--r--jjb/appc/appc-deployment.yaml10
-rw-r--r--jjb/appc/appc-master.yaml12
-rw-r--r--jjb/appc/appc-parent.yaml2
4 files changed, 19 insertions, 9 deletions
diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 9a2c1900c..26764c615 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -16,10 +16,12 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-cdt-settings'
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: appc-cdt-clm
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index ee14b2379..edffd6bf8 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -11,13 +11,15 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- project:
name: appc-deployment-docker
@@ -28,7 +30,7 @@
- 'docker-version-java-daily':
mvn-params: '-Dmaven.test.skip=true'
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-params: '-Dmaven.test.skip=true -P docker'
maven-versions-plugin: true
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
@@ -39,13 +41,15 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-deployment-settings'
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
docker-pom: 'pom.xml'
mvn-profile: docker
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
#- project:
# name: appc-deployment-arm64-docker
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index dd7353f9b..513126b17 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -4,11 +4,11 @@
project-name: 'appc'
jobs:
- '{project-name}-{stream}-verify-java':
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- '{project-name}-{stream}-merge-java':
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
- gerrit-maven-stage:
@@ -26,11 +26,13 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-settings'
maven-version: "mvn35"
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-docker-8c-8g
- project:
name: appc-sonar
@@ -42,7 +44,7 @@
sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
sonar-mvn-goal: '{sonar_mvn_goal}'
cron: '@daily'
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
project: 'appc'
project-name: 'appc'
branch: 'master'
@@ -57,7 +59,7 @@
- gerrit-maven-clm:
mvn-params: '-DskipTests'
build-timeout: 60
- build-node: ubuntu1604-builder-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
nexus-iq-namespace: 'onap-'
project: 'appc'
diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml
index 2ada1b0b0..c717284e7 100644
--- a/jjb/appc/appc-parent.yaml
+++ b/jjb/appc/appc-parent.yaml
@@ -22,6 +22,8 @@
stream:
- 'master':
branch: 'master'
+ - 'frankfurt':
+ branch: 'frankfurt'
mvn-settings: 'appc-parent-settings'
maven-version: "mvn35"
build-node: ubuntu1804-builder-4c-4g