summaryrefslogtreecommitdiffstats
path: root/jjb/apex
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/apex')
-rw-r--r--jjb/apex/apex-jjb-renderer.py4
-rw-r--r--jjb/apex/apex-verify-jobs.yaml8
-rw-r--r--jjb/apex/apex.yaml71
-rw-r--r--jjb/apex/apex.yaml.j211
-rw-r--r--jjb/apex/scenarios.yaml.hidden6
5 files changed, 97 insertions, 3 deletions
diff --git a/jjb/apex/apex-jjb-renderer.py b/jjb/apex/apex-jjb-renderer.py
index 0da47b518..58dc4fff9 100644
--- a/jjb/apex/apex-jjb-renderer.py
+++ b/jjb/apex/apex-jjb-renderer.py
@@ -20,7 +20,8 @@ def render_jjb():
gspathname = dict()
branch = dict()
build_slave = dict()
- env = Environment(loader=FileSystemLoader('./'), autoescape=True)
+ env = Environment(loader=FileSystemLoader('./'), autoescape=True,
+ keep_trailing_newline=True)
with open('scenarios.yaml.hidden') as _:
scenarios = yaml.safe_load(_)
@@ -45,5 +46,6 @@ def render_jjb():
with open('./apex.yaml', 'w') as fh:
fh.write(output)
+
if __name__ == "__main__":
render_jjb()
diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index f808793fb..f0f99fc78 100644
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -194,7 +194,11 @@
max-per-node: 3
max-total: 10
option: 'project'
-
+ - build-blocker:
+ use-build-blocker: true
+ block-level: 'NODE'
+ blocking-jobs:
+ - 'apex-.*-promote.*'
builders:
- description-setter:
description: "Built on $NODE_NAME"
@@ -245,7 +249,7 @@
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
FUNCTEST_SUITE_NAME=tempest_smoke
FUNCTEST_MODE=testcase
- node-parameters: false
+ node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index b20c469bf..82f766e20 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -123,6 +123,8 @@
<<: *master
- 'os-nosdn-nofeature-ha':
<<: *master
+ - 'os-nosdn-nofeature-ha-ipv6':
+ <<: *master
- 'os-odl-nofeature-noha':
<<: *master
- 'os-odl-nofeature-ha':
@@ -131,6 +133,8 @@
<<: *master
- 'os-nosdn-queens-ha':
<<: *master
+ - 'os-nosdn-queens-ha-ipv6':
+ <<: *master
- 'os-odl-queens-noha':
<<: *master
- 'os-odl-queens-ha':
@@ -145,6 +149,14 @@
<<: *master
- 'os-odl-bgpvpn_queens-noha':
<<: *master
+ - 'os-odl-sfc-ha':
+ <<: *master
+ - 'os-odl-sfc-noha':
+ <<: *master
+ - 'os-odl-sfc_queens-ha':
+ <<: *master
+ - 'os-odl-sfc_queens-noha':
+ <<: *master
- 'os-nosdn-nofeature-noha':
<<: *euphrates
- 'os-nosdn-nofeature-ha':
@@ -912,6 +924,17 @@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
+ - name: 'apex-fetch-logs-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- multijob:
name: create snapshot
condition: SUCCESSFUL
@@ -1490,6 +1513,14 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- name: 'apex-os-odl-nofeature-noha-baremetal-master'
node-parameters: false
current-parameters: false
@@ -1522,6 +1553,14 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-nosdn-queens-ha-ipv6-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- name: 'apex-os-odl-queens-noha-baremetal-master'
node-parameters: false
current-parameters: false
@@ -1578,6 +1617,38 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
+ - name: 'apex-os-odl-sfc-ha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+ - name: 'apex-os-odl-sfc-noha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+ - name: 'apex-os-odl-sfc_queens-ha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
+ - name: 'apex-os-odl-sfc_queens-noha-baremetal-master'
+ node-parameters: false
+ current-parameters: false
+ predefined-parameters: |
+ OPNFV_CLEAN=yes
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
# euphrates Builder
- builder:
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 8d5c673dd..31e3bd8f3 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -800,6 +800,17 @@
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: false
+ - name: 'apex-fetch-logs-{stream}'
+ current-parameters: false
+ predefined-parameters: |
+ GERRIT_BRANCH=$GERRIT_BRANCH
+ GERRIT_REFSPEC=$GERRIT_REFSPEC
+ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+ node-parameters: true
+ kill-phase-on: NEVER
+ abort-all-job: true
+ git-revision: false
- multijob:
name: create snapshot
condition: SUCCESSFUL
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 13449aa90..b032613a3 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -1,10 +1,12 @@
master:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
+ - 'os-nosdn-nofeature-ha-ipv6'
- 'os-odl-nofeature-noha'
- 'os-odl-nofeature-ha'
- 'os-nosdn-queens-noha'
- 'os-nosdn-queens-ha'
+ - 'os-nosdn-queens-ha-ipv6'
- 'os-odl-queens-noha'
- 'os-odl-queens-ha'
- 'k8s-nosdn-nofeature-noha'
@@ -12,6 +14,10 @@ master:
- 'os-odl-bgpvpn-noha'
- 'os-odl-bgpvpn_queens-ha'
- 'os-odl-bgpvpn_queens-noha'
+ - 'os-odl-sfc-ha'
+ - 'os-odl-sfc-noha'
+ - 'os-odl-sfc_queens-ha'
+ - 'os-odl-sfc_queens-noha'
fraser:
- 'os-nosdn-nofeature-ha'
- 'os-odl-bgpvpn-ha'