Merge "Add Ubuntu 18.04 docker nodes, including arm64"

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
new file mode 100644 (file)
index 0000000..8d05e42
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-8c-32g.cfg
@@ -0,0 +1,2 @@
+IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20190315-024623.770
+HARDWARE_ID=v2-highcpu-32

diff --git a/jjb/ta/ci-build.yaml b/jjb/ta/ci-build.yaml
index 3d6eda3..62399a5 100644 (file)
--- a/jjb/ta/ci-build.yaml
+++ b/jjb/ta/ci-build.yaml
@@ -2,7 +2,7 @@
     name: ta-ci-build
     project: none
     project-name: none
-    build-node: centos7-builder-8c-16g
+    build-node: centos7-builder-8c-32g
     stream: master
     build-timeout: 120
     jobs: