summaryrefslogtreecommitdiffstats
path: root/jjb/apex
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/apex')
-rw-r--r--jjb/apex/apex.yml18
-rw-r--r--jjb/apex/apex.yml.j218
2 files changed, 26 insertions, 10 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index dfeea0711..5290fdc05 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -15,6 +15,7 @@
- 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
- 'apex-upload-snapshot'
- 'apex-create-snapshot'
+ - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
# branch: branch (eg. stable/arno)
stream:
@@ -1527,7 +1528,7 @@
# Flex job
- job-template:
- name: 'apex-flexjob-os-nosdn-nofeature-ha-{scenario_stream}'
+ name: 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
project-type: 'multijob'
@@ -1538,10 +1539,9 @@
scm:
- git-scm
triggers:
- - 'apex-'
+ - 'apex-{stream}'
parameters:
- '{project}-defaults'
- - '{project}-baremetal-{scenario_stream}-defaults'
- project-parameter:
project: '{project}'
branch: '{branch}'
@@ -1551,6 +1551,14 @@
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
description: "Scenario to deploy with."
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: SSH_KEY
+ default: /root/.ssh/id_rsa
+ description: 'SSH key to use for Apex'
properties:
- logrotate-default
- build-blocker:
@@ -1573,7 +1581,7 @@
name: 'Baremetal Deploy'
condition: SUCCESSFUL
projects:
- - name: 'apex-deploy-baremetal-{scenario_stream}'
+ - name: 'apex-deploy-baremetal-{stream}'
node-parameters: true
current-parameters: true
predefined-parameters: |
@@ -1588,7 +1596,7 @@
name: Yardstick
condition: ALWAYS
projects:
- - name: 'yardstick-apex-baremetal-daily-{scenario_stream}'
+ - name: 'yardstick-apex-baremetal-daily-{stream}'
node-parameters: true
current-parameters: false
predefined-parameters:
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index b6737dc6a..ec74a7419 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -15,6 +15,7 @@
- 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
- 'apex-upload-snapshot'
- 'apex-create-snapshot'
+ - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
# stream: branch with - in place of / (eg. stable-arno)
# branch: branch (eg. stable/arno)
stream:
@@ -954,7 +955,7 @@
# Flex job
- job-template:
- name: 'apex-flexjob-os-nosdn-nofeature-ha-{scenario_stream}'
+ name: 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
project-type: 'multijob'
@@ -965,10 +966,9 @@
scm:
- git-scm
triggers:
- - 'apex-{{ stream }}'
+ - 'apex-{stream}'
parameters:
- '{project}-defaults'
- - '{project}-baremetal-{scenario_stream}-defaults'
- project-parameter:
project: '{project}'
branch: '{branch}'
@@ -978,6 +978,14 @@
name: DEPLOY_SCENARIO
default: 'os-nosdn-nofeature-ha'
description: "Scenario to deploy with."
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: SSH_KEY
+ default: /root/.ssh/id_rsa
+ description: 'SSH key to use for Apex'
properties:
- logrotate-default
- build-blocker:
@@ -1000,7 +1008,7 @@
name: 'Baremetal Deploy'
condition: SUCCESSFUL
projects:
- - name: 'apex-deploy-baremetal-{scenario_stream}'
+ - name: 'apex-deploy-baremetal-{stream}'
node-parameters: true
current-parameters: true
predefined-parameters: |
@@ -1015,7 +1023,7 @@
name: Yardstick
condition: ALWAYS
projects:
- - name: 'yardstick-apex-baremetal-daily-{scenario_stream}'
+ - name: 'yardstick-apex-baremetal-daily-{stream}'
node-parameters: true
current-parameters: false
predefined-parameters: