summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml11
-rw-r--r--jjb/compass4nfv/compass-project-jobs.yml18
-rw-r--r--jjb/opnfv/slave-params.yml13
3 files changed, 23 insertions, 19 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 2a8248186..c50f7341a 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -204,16 +204,7 @@
choices:
- 'trusty'
- 'centos7'
-- parameter:
- name: 'huawei-virtual-defaults'
- parameters:
- - label:
- name: SLAVE_LABEL
- default: 'huawei-deploy-vm'
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on these Jenkins Slaves'
+
########################
# trigger macros
########################
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 02e91028c..cb94c72b8 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -29,7 +29,7 @@
disabled: false
- node: 'huawei-deploy-vm'
+ node: 'huawei-virtual'
concurrent: true
@@ -87,6 +87,22 @@
pattern: 'docs/**|.gitignore'
builders:
+ - trigger-builds:
+ - project: 'compass-verify-deploy-{stream}'
+ current-parameters: true
+ same-node: true
+ block: true
+
+- job-template:
+ name: 'compass-verify-deploy-{stream}'
+
+ scm:
+ - git-scm:
+ credentials-id: '{ssh-credentials}'
+ refspec: ''
+ branch: '{branch}'
+
+ builders:
- shell:
!include-raw: ./compass-build.sh
- shell:
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 20387f24f..5204f7926 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -248,16 +248,13 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
+
- parameter:
- name: 'huawei-deploy-vm-defaults'
+ name: 'huawei-virtual-defaults'
parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - huawei-deploy-vm
- default-slaves:
- - huawei-deploy-vm
+ - label:
+ name: SLAVE_LABEL
+ default: 'huawei-deploy-vm'
- string:
name: INSTALLER_VERSION
default: stable