switch compass verify-job and virtual-deploy job to us lab

JIRA: COMPASS-130

Change-Id: I384aaa849463878e21dd196ba6ae5e07895c5a50
Signed-off-by: m00133142 <meimei@huawei.com>

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 07e0042..9978fdc 100644 (file)
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -7,7 +7,6 @@
 
     jobs:
         - 'compass-verify'
-        - 'compass-verify-on-ericsson-node'
         - 'compass-merge'
         - 'compass-daily-{stream}'
         - 'compass-build-iso'
@@ -29,74 +28,13 @@
             node: 'huawei-deploy-vm'
         - cluster:
             conf: 'virtual_cluster'
-            node: 'huawei-build'
-
-
+            node: 'huawei-deploy-vm'
 
     project: 'compass4nfv'
 
 ########################
 # job templates
 ########################
-- job-template:
-    name: 'compass-verify-on-ericsson-node'
-
-    project-type: freestyle
-
-    disabled: true
-
-    node: ericsson-build
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
-        - compass-parameter:
-            installer: '{installer}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-
-    builders:
-        - 'builder-compass-build-iso'
-        - 'builder-compass-workspace-cleanup'
-
 - job-template:
     name: 'compass-verify'
 
@@ -104,7 +42,7 @@
 
     disabled: false
 
-    node: huawei-build
+    node: 'huawei-deploy-vm'
 
     logrotate:
         daysToKeep: 30
@@ -266,7 +204,7 @@
 
     project-type: freestyle
 
-    node: ericsson-build
+    node: huawei-build
 
     logrotate:
         daysToKeep: 30