diff options
| -rw-r--r-- | jjb/fuel/fuel-ci-jobs.yml | 13 | ||||
| -rw-r--r-- | jjb/fuel/fuel-project-jobs.yml | 3 | ||||
| -rw-r--r-- | jjb/joid/joid-ci-jobs.yml | 12 | ||||
| -rw-r--r-- | jjb/joid/joid-deploy.sh | 2 | ||||
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 4 |
5 files changed, 18 insertions, 16 deletions
diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml index 478dffb38..97d3bc5de 100644 --- a/jjb/fuel/fuel-ci-jobs.yml +++ b/jjb/fuel/fuel-ci-jobs.yml @@ -165,7 +165,8 @@ parameters: - project-parameter: project: '{project}' - - '{pod}-defaults' + - '{pod}-defaults': + installer: '{installer}' - '{installer}-defaults' - string: name: DEPLOY_SCENARIO @@ -211,16 +212,6 @@ name: GS_URL default: artifacts.opnfv.org/$PROJECT{gs-pathname} description: "URL to Google Storage." -- parameter: - name: 'virtual-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'fuel-deploy-virtual' - - 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/fuel/fuel-project-jobs.yml b/jjb/fuel/fuel-project-jobs.yml index a8f940363..b3983986f 100644 --- a/jjb/fuel/fuel-project-jobs.yml +++ b/jjb/fuel/fuel-project-jobs.yml @@ -204,7 +204,8 @@ project: '{project}' - gerrit-parameter: branch: '{branch}' - - 'fuel-deploy-virtual-defaults' + - 'virtual-defaults': + installer: '{installer}' - '{installer}-defaults' - fuel-project-parameter: gs-pathname: '{gs-pathname}' diff --git a/jjb/joid/joid-ci-jobs.yml b/jjb/joid/joid-ci-jobs.yml index bac8c6985..2617904c3 100644 --- a/jjb/joid/joid-ci-jobs.yml +++ b/jjb/joid/joid-ci-jobs.yml @@ -28,6 +28,8 @@ pod: - intel-pod5: <<: *brahmaputra + - virtual: + <<: *brahmaputra #-------------------------------- # master #-------------------------------- @@ -37,6 +39,8 @@ <<: *master - juniper-pod1: <<: *master + - virtual: + <<: *master #-------------------------------- # new scenario descriptions scenario: @@ -145,7 +149,8 @@ - project-parameter: project: '{project}' - '{installer}-defaults' - - '{pod}-defaults' + - '{pod}-defaults': + installer: '{installer}' scm: - git-scm: @@ -155,7 +160,6 @@ builders: - 'builder-macro' - ######################## # builder macros ######################## @@ -191,3 +195,7 @@ name: 'joid-os-odl_l2-nofeature-ha-juniper-pod1-trigger' triggers: - timed: '' +- trigger: + name: 'joid-os-odl_l2-nofeature-ha-virtual-trigger' + triggers: + - timed: '' diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh index c0fdfe512..e855e2e2d 100644 --- a/jjb/joid/joid-deploy.sh +++ b/jjb/joid/joid-deploy.sh @@ -44,6 +44,8 @@ fi POD=orange-pod2 ;; juniper-us-test-1) POD=juniper-pod1 ;; + *virtual*) + POD=default ;; *) POD=$NODE_NAME ;; esac diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index c6078c613..20387f24f 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -422,11 +422,11 @@ description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'fuel-deploy-virtual-defaults' + name: 'virtual-defaults' parameters: - label: name: SLAVE_LABEL - default: 'fuel-deploy-virtual' + default: '{installer}-deploy-virtual' - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT |