Merge "Automation adds smo-o1.yaml"

diff --git a/global-jjb b/global-jjb
index 59faa99..142b469 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 59faa9977d726858902dcf513999616aaf6de7a5
+Subproject commit 142b4697db846df8f294427b52533c2e797b9610

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
index 3021ff5..0b921ed 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-builder-1c-1g.cfg
@@ -1,3 +1,4 @@
+LABELS=centos7-builder-1c-1g
 IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200317-165605.039
 VOLUME_SIZE=20
 HARDWARE_ID=v2-highcpu-1

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg
index 62407da..5f4ed86 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g-200g.cfg
@@ -1,3 +1,4 @@
+LABELS=centos7-docker-2c-8g-200g
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200317-104237.628
 HARDWARE_ID=v2-standard-2
 VOLUME_SIZE=200

diff --git a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg
index 00cb8b3..a1a39a1 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos7-docker-2c-8g.cfg
@@ -1,3 +1,4 @@
+LABELS=centos7-docker-2c-8g
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200317-104237.628
 HARDWARE_ID=v2-standard-2
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg
index 1e1fddc..16cb749 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-1c-1g.cfg
@@ -1,3 +1,4 @@
+LABELS=centos8-builder-1c-1g
 IMAGE_NAME=ZZCI - CentOS 8 - builder - x86_64 - 20200403-151332.560
 VOLUME_SIZE=20
 HARDWARE_ID=v2-highcpu-1

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
index 1cf4672..c6edac7 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675
 LABELS=ubuntu1804-builder-2c-2g
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675
 HARDWARE_ID=v2-highcpu-2
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 1c6f38a..d331089 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675
 LABELS=ubuntu1804-builder-4c-4g
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20200317-165726.675
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
index 3df02e5..fbaf72b 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
@@ -1,4 +1,4 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200317-104132.496
 LABELS=ubuntu1804-docker-4c-4g
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200317-104132.496
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=20

diff --git a/jjb/com-log/com-log.yaml b/jjb/com-log/com-log.yaml
index 658bca0..266ebaa 100644 (file)
--- a/jjb/com-log/com-log.yaml
+++ b/jjb/com-log/com-log.yaml
@@ -102,6 +102,8 @@
     <<: *com_log_common
     # these templates ignore the pre-build script
     name: com-log-release
+    # release uses sigul which requires centos
+    build-node: centos7-builder-1c-1g
     jobs:
       - gerrit-packagecloud-release-verify
       - gerrit-packagecloud-release-merge