Merge "Add make common step before making subprojects"
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
index 09c0807..41440ff 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726
-LABELS=centos7-basebuild-2c-1g centos7-builder-2c-1g
+LABELS=centos7-builder-2c-1g
HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
index 4030359..dbabd5f 100644
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180328-1726
-LABELS=centos7-basebuild-4c-4g centos7-builder-4c-4g
+LABELS=centos7-builder-4c-4g
HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg
deleted file mode 100644
index 8aa9f31..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-2c-1g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
-LABELS=ubuntu1604-basebuild-2c-1g ubuntu1604-builder-2c-1g
-HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg
deleted file mode 100644
index 928f669..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-2g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
-LABELS=ubuntu1604-basebuild-4c-2g ubuntu1604-builder-4c-2g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg
deleted file mode 100644
index ce326bc..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-4c-4g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
-LABELS=ubuntu1604-basebuild-4c-4g ubuntu1604-builder-4c-4g
-HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg
deleted file mode 100644
index e7c4157..0000000
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-basebuild-8c-8g.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
-LABELS=ubuntu1604-basebuild-8c-8g ubuntu1604-builder-8c-8g
-HARDWARE_ID=v2-highcpu-8
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
new file mode 100644
index 0000000..b000ff6
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-2c-1g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
+LABELS=ubuntu1604-builder-2c-1g
+HARDWARE_ID=v2-highcpu-2
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
new file mode 100644
index 0000000..5bff88e
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-2g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
+LABELS=ubuntu1604-builder-4c-2g
+HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
new file mode 100644
index 0000000..48112d5
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-4c-4g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
+LABELS=ubuntu1604-builder-4c-4g
+HARDWARE_ID=v2-highcpu-4
diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
new file mode 100644
index 0000000..30a7bcd
--- /dev/null
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-builder-8c-8g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=Ubuntu 16.04 - basebuild - 20171102-0010
+LABELS=ubuntu1604-builder-8c-8g
+HARDWARE_ID=v2-highcpu-8