From: meimei Date: Fri, 20 May 2016 09:33:06 +0000 (+0800) Subject: Rename Huawei Jenkins slaves X-Git-Tag: colorado.1.0~130 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F14429%2F1;p=compass4nfv.git 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 --- 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