diff options
4 files changed, 5 insertions, 3 deletions
diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg index b08b4fb38..cf844cd28 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-2c-2g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-2c-2g -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg index ec1d18ac0..0b62d1abc 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/centos7-builder-4c-4g.cfg @@ -1,4 +1,4 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 LABELS=centos7-builder-4c-4g -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=v3-standard-4 VOLUME_SIZE=40 diff --git a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg index 1a8712799..80e19418e 100644 --- a/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg +++ b/jenkins-config/clouds/openstack/FDIOVEX-CI/cloud.cfg @@ -8,7 +8,7 @@ OS_CLOUD=vexci # Default Template Configuration IMAGE_NAME=ZZCI - CentOS 7 - builder - x86_64 - 20200115-151843.366 VOLUME_SIZE=20 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=v3-standard-2 NETWORK_ID=bcb9a62c-5a82-4293-a8c6-d73e8c2dbd03 USER_DATA_ID=jenkins-init-system INSTANCE_CAP=20 diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 1cf861359..191b5920c 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -28,6 +28,8 @@ branch: 'master' - dev-next-socket: branch: 'dev-next-socket' + - dev-mitm-proxy: + branch: 'dev-mitm-proxy' - project: name: tldk-view |