Switch FLOATING_IP_POOL back to empty

Now that global-jjb has
https://gerrit.linuxfoundation.org/infra/c/releng/global-jjb/+/62991

we need to stop using public.
Also pull in new rtdv3 build script

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I5c771b14d001b1cb79cfaf95c82127bf885af95e

diff --git a/global-jjb b/global-jjb
index 8285615..72050cc 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 8285615e111cae15f76eba24e5720068d16e778f
+Subproject commit 72050cce2c57e8eb314b2f518b846f7810595fbb

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 0c3c14d..a2a12fb 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,4 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200123-164248.786
 HARDWARE_ID=v2-standard-2
 VOLUME_SIZE=200
-FLOATING_IP_POOL=public

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 a428fdd..d1735c5 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,4 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - x86_64 - 20200123-164248.786
 HARDWARE_ID=v2-standard-2
-FLOATING_IP_POOL=public
 VOLUME_SIZE=20

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 97f0732..737d268 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -12,7 +12,7 @@ NETWORK_ID=b9e029b4-9b35-4a83-a4e6-c820eb00c3ec
 USER_DATA_ID=jenkins-init-script
 INSTANCE_CAP=10
 SANDBOX_CAP=4
-FLOATING_IP_POOL=public
+FLOATING_IP_POOL=
 SECURITY_GROUPS=default
 AVAILABILITY_ZONE=nova
 STARTUP_TIMEOUT=600000

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 6a70474..f275961 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-2c-2g.cfg
@@ -2,4 +2,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190926-151758.548
 LABELS=ubuntu1804-builder-2c-2g
 HARDWARE_ID=v2-highcpu-2
 VOLUME_SIZE=10
-FLOATING_IP_POOL=public

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 6cbe7ec..854fa33 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -2,4 +2,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20190926-151758.548
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=10
-FLOATING_IP_POOL=public

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 021aea4..7adde71 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-4c-4g.cfg
@@ -2,4 +2,3 @@ IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20200123-175351.393
 LABELS=ubuntu1804-docker-4c-4g
 HARDWARE_ID=v2-highcpu-4
 VOLUME_SIZE=20
-FLOATING_IP_POOL=public