summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorm00133142 <meimei@huawei.com>2015-10-30 13:23:24 -0700
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2015-11-02 07:35:41 +0000
commit650f6ba2fa6cc37c1452fe676eee700a54744c97 (patch)
treeb67cdbbedaa551aa67a276091838713ced9a8e4d /jjb
parentbdb779857fe4e0f6a8281666e68783d98c8d5b3c (diff)
switch compass verify-job and virtual-deploy job to us lab
JIRA: COMPASS-130 Change-Id: I384aaa849463878e21dd196ba6ae5e07895c5a50 Signed-off-by: m00133142 <meimei@huawei.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass4nfv.yml68
1 files changed, 3 insertions, 65 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 07e004263..9978fdc79 100644
--- 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,9 +28,7 @@
node: 'huawei-deploy-vm'
- cluster:
conf: 'virtual_cluster'
- node: 'huawei-build'
-
-
+ node: 'huawei-deploy-vm'
project: 'compass4nfv'
@@ -39,72 +36,13 @@
# 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'
project-type: freestyle
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