From 0ed4e93eb256c60a326d233dbf3259e123caf2d1 Mon Sep 17 00:00:00 2001 From: meimei Date: Fri, 20 May 2016 17:33:06 +0800 Subject: [PATCH] Rename Huawei Jenkins slaves Slave names will be as below. - huawei-us-deploy-bare-1 -> huawei-pod1 - huawei-us-deploy-bare-2 -> huawei-pod2 - huawei-sh-test-2-defaults -> huawei-pod3 - huawei-sh-pod6 -> huawei-pod4 - huawei-us-deploy-vm-1 -> huawei-virtual1 - huawei-us-deploy-vm-2 -> huawei-virtual2 - huawei-us-deploy-vm-3 -> huawei-virtual3 - huawei-us-deploy-vm-4 -> huawei-virtual4 Change-Id: I3a8727b0db53739b02a805cf40ddc3ba7f50ef52 Signed-off-by: meimei --- .../{huawei-us-deploy-bare-1 => huawei-pod1}/network.yml | 0 .../{huawei-us-deploy-bare-1 => huawei-pod1}/network_ocl.yml | 0 .../{huawei-us-deploy-bare-1 => huawei-pod1}/os-nosdn-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-1 => huawei-pod1}/os-ocl-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-1 => huawei-pod1}/os-odl_l2-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-1 => huawei-pod1}/os-odl_l3-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-1 => huawei-pod1}/os-onos-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-2 => huawei-pod2}/network.yml | 0 .../{huawei-us-deploy-bare-2 => huawei-pod2}/network_ocl.yml | 0 .../{huawei-us-deploy-bare-2 => huawei-pod2}/os-nosdn-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-2 => huawei-pod2}/os-ocl-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-2 => huawei-pod2}/os-odl_l2-nofeature-ha.yml | 0 .../{huawei-us-deploy-bare-2 => huawei-pod2}/os-onos-nofeature-ha.yml | 0 .../vm_environment/{huawei-us-deploy-vm-1 => huawei-virtual1}/network.yml | 0 .../{huawei-us-deploy-vm-1 => huawei-virtual1}/network_ocl.yml | 0 .../vm_environment/{huawei-us-deploy-vm-2 => huawei-virtual2}/network.yml | 0 .../{huawei-us-deploy-vm-2 => huawei-virtual2}/network_ocl.yml | 0 .../vm_environment/{huawei-us-deploy-vm-3 => huawei-virtual3}/network.yml | 0 .../{huawei-us-deploy-vm-3 => huawei-virtual3}/network_ocl.yml | 0 .../vm_environment/{huawei-us-deploy-vm-4 => huawei-virtual4}/network.yml | 0 .../{huawei-us-deploy-vm-4 => huawei-virtual4}/network_ocl.yml | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-1 => huawei-pod1}/network.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-1 => huawei-pod1}/network_ocl.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-1 => huawei-pod1}/os-nosdn-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-1 => huawei-pod1}/os-ocl-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-1 => huawei-pod1}/os-odl_l2-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-1 => huawei-pod1}/os-odl_l3-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-1 => huawei-pod1}/os-onos-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-2 => huawei-pod2}/network.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-2 => huawei-pod2}/network_ocl.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-2 => huawei-pod2}/os-nosdn-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-2 => huawei-pod2}/os-ocl-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-2 => huawei-pod2}/os-odl_l2-nofeature-ha.yml (100%) rename deploy/conf/hardware_environment/{huawei-us-deploy-bare-2 => huawei-pod2}/os-onos-nofeature-ha.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-1 => huawei-virtual1}/network.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-1 => huawei-virtual1}/network_ocl.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-2 => huawei-virtual2}/network.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-2 => huawei-virtual2}/network_ocl.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-3 => huawei-virtual3}/network.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-3 => huawei-virtual3}/network_ocl.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-4 => huawei-virtual4}/network.yml (100%) rename deploy/conf/vm_environment/{huawei-us-deploy-vm-4 => huawei-virtual4}/network_ocl.yml (100%) diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network.yml b/deploy/conf/hardware_environment/huawei-pod1/network.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network.yml rename to deploy/conf/hardware_environment/huawei-pod1/network.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network_ocl.yml rename to deploy/conf/hardware_environment/huawei-pod1/network_ocl.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-nosdn-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-ocl-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l2-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l3-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-onos-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network.yml b/deploy/conf/hardware_environment/huawei-pod2/network.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network.yml rename to deploy/conf/hardware_environment/huawei-pod2/network.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-2/network_ocl.yml rename to deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-nosdn-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod2/os-nosdn-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-ocl-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-odl_l2-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml similarity index 100% rename from deploy/conf/hardware_environment/huawei-us-deploy-bare-2/os-onos-nofeature-ha.yml rename to deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-1/network.yml b/deploy/conf/vm_environment/huawei-virtual1/network.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-1/network.yml rename to deploy/conf/vm_environment/huawei-virtual1/network.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-1/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-1/network_ocl.yml rename to deploy/conf/vm_environment/huawei-virtual1/network_ocl.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network.yml b/deploy/conf/vm_environment/huawei-virtual2/network.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-2/network.yml rename to deploy/conf/vm_environment/huawei-virtual2/network.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual2/network_ocl.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-2/network_ocl.yml rename to deploy/conf/vm_environment/huawei-virtual2/network_ocl.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-3/network.yml b/deploy/conf/vm_environment/huawei-virtual3/network.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-3/network.yml rename to deploy/conf/vm_environment/huawei-virtual3/network.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-3/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-3/network_ocl.yml rename to deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-4/network.yml b/deploy/conf/vm_environment/huawei-virtual4/network.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-4/network.yml rename to deploy/conf/vm_environment/huawei-virtual4/network.yml diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-4/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml similarity index 100% rename from deploy/conf/vm_environment/huawei-us-deploy-vm-4/network_ocl.yml rename to deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml -- 2.16.6