summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-12-10 18:37:39 +0000
committerGerrit Code Review <gerrit@onap.org>2018-12-10 18:37:39 +0000
commit261c38400d4aa31ec55127d3bd32afd309b36c06 (patch)
tree0354858fd16f7062e13201996564a7c92709db61
parent3c3d305932a1dc7c927f3db70b85762277e12b51 (diff)
parent004c68cfd58783bed2df1e47a2fec92c75b14ee8 (diff)
Merge "Add arm64 docker build for multicloud"
-rw-r--r--jjb/multicloud/multicloud-azure-java.yaml24
-rw-r--r--jjb/multicloud/multicloud-framework-java.yaml22
-rw-r--r--jjb/multicloud/multicloud-k8s.yaml22
-rw-r--r--jjb/multicloud/multicloud-openstack-ocata-csit.yaml8
-rw-r--r--jjb/multicloud/multicloud-openstack-pike-csit.yaml4
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-csit.yaml4
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-java.yaml22
-rw-r--r--jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml22
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml18
9 files changed, 141 insertions, 5 deletions
diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml
index 1c818d228..520a97aec 100644
--- a/jjb/multicloud/multicloud-azure-java.yaml
+++ b/jjb/multicloud/multicloud-azure-java.yaml
@@ -25,7 +25,29 @@
build-node: ubuntu1604-docker-8c-8g
files: '**'
archive-artifacts: ''
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1604-builder-4c-2g
+
+- project:
+ name: multicloud-azure-arm64-java
+ project-name: 'multicloud-azure-arm64'
+ project: 'multicloud/azure'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-azure-settings'
+ subproject:
+ - 'azure':
+ pom: 'azure/pom.xml'
+ pattern: 'azure/**'
+ jobs:
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-azure-docker-image.sh'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-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 fd3d0f2df..d59d92ed0 100644
--- a/jjb/multicloud/multicloud-framework-java.yaml
+++ b/jjb/multicloud/multicloud-framework-java.yaml
@@ -28,6 +28,28 @@
build-node: ubuntu1604-builder-4c-4g
- project:
+ name: multicloud-framework-arm64-java
+ project-name: 'multicloud-framework-arm64'
+ project: 'multicloud/framework'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-framework-settings'
+ subproject:
+ - 'multivimbroker':
+ pom: 'multivimbroker/pom.xml'
+ pattern: 'multivimbroker/**'
+ jobs:
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-framework-docker-image.sh'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-arm64-4c-2g
+
+- project:
name: multicloud-framework-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 711539b4c..4131c7f14 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -23,3 +23,25 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: multicloud-k8s-arm64
+ project-name: 'multicloud-k8s-arm64'
+ path: 'src/k8splugin'
+ golangver: 'golang111'
+ jobs:
+ - '{project-name}-{stream}-docker-golang-shell-daily':
+ script:
+ !include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
+ project: 'multicloud/k8s'
+ subproject:
+ - validation-scripts:
+ path: '.'
+ pattern: '**'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-k8s-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-arm64-4c-2g
diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
index 404577d48..374b27fa0 100644
--- a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml
@@ -8,8 +8,12 @@
stream: 'master'
functionality:
- 'functionality1':
- trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
+ trigger_jobs:
+ - 'multicloud-openstack-master-docker-java-version-shell-daily'
+ - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
- 'hpa-discovery':
- trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
+ trigger_jobs:
+ - 'multicloud-openstack-master-docker-java-version-shell-daily'
+ - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-pike-csit.yaml b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
index f61f66dd8..c8a6cd88b 100644
--- a/jjb/multicloud/multicloud-openstack-pike-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-pike-csit.yaml
@@ -8,6 +8,8 @@
stream: 'master'
functionality:
- 'functionality1':
- trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily'
+ trigger_jobs:
+ - 'multicloud-openstack-master-docker-java-version-shell-daily'
+ - 'multicloud-openstack-arm64-master-docker-java-version-shell-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
index 6d1fc12fe..4c56a372d 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-csit.yaml
@@ -8,6 +8,8 @@
stream: 'master'
functionality:
- 'functionality1':
- trigger_jobs: 'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
+ trigger_jobs:
+ - 'multicloud-openstack-vmware-master-docker-java-version-shell-daily'
+ - 'multicloud-openstack-vmware-arm64-master-docker-java-version-shell-daily'
robot-options: ''
branch: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
index f63f2aa33..3c8be8acf 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml
@@ -28,6 +28,28 @@
build-node: ubuntu1604-builder-4c-4g
- project:
+ name: multicloud-openstack-vmware-arm64-java
+ project-name: 'multicloud-openstack-vmware-arm64'
+ project: 'multicloud/openstack/vmware'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-vmware-settings'
+ subproject:
+ - 'vio':
+ pom: 'vio/pom.xml'
+ pattern: 'vio/**'
+ jobs:
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh'
+ build-node: ubuntu1604-docker-arm64-4c-2g
+ files: '**'
+ archive-artifacts: ''
+
+- project:
name: multicloud-openstack-vmware-sonar
jobs:
- gerrit-maven-sonar
diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
index e3b969cdf..6718c4dc3 100644
--- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
+++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml
@@ -24,3 +24,25 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-builder-4c-4g
+
+- project:
+ name: multicloud-openstack-vmware-vesagent-arm64-java
+ project-name: 'multicloud-openstack-vmware-vesagent-arm64'
+ project: 'multicloud/openstack/vmware'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-vmware-settings'
+ subproject:
+ - 'vesagent':
+ pom: 'vesagent/pom.xml'
+ pattern: 'vesagent/**'
+ jobs:
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-openstack-vmware-vesagent-docker-image.sh'
+ build-node: ubuntu1604-docker-arm64-4c-2g
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 71b7fd8bb..f995c9987 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -58,6 +58,24 @@
build-node: 'ubuntu1604-memcached-4c-4g'
- project:
+ name: multicloud-openstack-arm64
+ project-name: 'multicloud-openstack-arm64'
+ project: 'multicloud/openstack'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'multicloud-openstack-settings'
+ jobs:
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-multicloud-openstack-docker-image.sh'
+ build-node: ubuntu1604-docker-arm64-4c-2g
+ files: '**'
+ archive-artifacts: ''
+
+- project:
name: multicloud-openstack-newton-sonar
jobs:
- gerrit-maven-sonar