summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-05-04 19:48:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-04 19:48:11 +0000
commit2a556f8b1db01fa137f6596862dc39e229cfa276 (patch)
tree1ba1ef0627b8a822a6436c5e12cce59f12474abe
parentd29c3e495aee81b96f653b6a4b5ee72a9bf33976 (diff)
parent696a4f785750d878fdcfe1218d52d6a863bcc987 (diff)
Merge "fuel, armband: basic healthcheck in verify jobs"
-rw-r--r--jjb/armband/armband-verify-jobs.yml56
-rw-r--r--jjb/fuel/fuel-verify-jobs.yml54
2 files changed, 42 insertions, 68 deletions
diff --git a/jjb/armband/armband-verify-jobs.yml b/jjb/armband/armband-verify-jobs.yml
index c800872c7..08cf3c084 100644
--- a/jjb/armband/armband-verify-jobs.yml
+++ b/jjb/armband/armband-verify-jobs.yml
@@ -21,12 +21,8 @@
# patch verification phases
#####################################
phase:
- - 'basic':
- slave-label: 'armband-virtual'
- 'deploy-virtual':
slave-label: 'armband-virtual'
- - 'smoke-test':
- slave-label: 'armband-virtual'
#####################################
# jobs
#####################################
@@ -105,15 +101,18 @@
installer: '{installer}'
- '{installer}-defaults':
gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
builders:
- description-setter:
description: "Built on $NODE_NAME"
- multijob:
- name: basic
+ name: deploy-virtual
condition: SUCCESSFUL
projects:
- - name: 'armband-verify-basic-{stream}'
+ - name: 'armband-verify-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
BRANCH=$BRANCH
@@ -123,33 +122,39 @@
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
+
- multijob:
- name: deploy-virtual
+ name: smoke-test
condition: SUCCESSFUL
projects:
- - name: 'armband-verify-deploy-virtual-{stream}'
+ # Use Functest job definition from jjb/functest/functest-daily-jobs
+ - name: 'functest-fuel-armband-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=tier
+ FUNCTEST_TIER=healthcheck
+ # Should be in sync with fuel-deploy.sh default scenario
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- - multijob:
- name: smoke-test
- condition: SUCCESSFUL
- projects:
- - name: 'armband-verify-smoke-test-{stream}'
+ - name: 'functest-fuel-armband-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=testcase
+ FUNCTEST_SUITE_NAME=vping_ssh
+ # Should be in sync with fuel-deploy.sh default scenario
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- job-template:
@@ -170,7 +175,6 @@
use-build-blocker: true
blocking-jobs:
- 'armband-verify-deploy-.*'
- - 'armband-verify-test-.*'
block-level: 'NODE'
scm:
@@ -200,23 +204,7 @@
# builder macros
#####################################
- builder:
- name: 'armband-verify-basic-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"
-
-- builder:
name: 'armband-verify-deploy-virtual-macro'
builders:
- shell:
!include-raw: ../fuel/fuel-deploy.sh
-
-- builder:
- name: 'armband-verify-smoke-test-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"
diff --git a/jjb/fuel/fuel-verify-jobs.yml b/jjb/fuel/fuel-verify-jobs.yml
index d81b0ce92..bef6a5094 100644
--- a/jjb/fuel/fuel-verify-jobs.yml
+++ b/jjb/fuel/fuel-verify-jobs.yml
@@ -21,12 +21,8 @@
# patch verification phases
#####################################
phase:
- - 'basic':
- slave-label: 'fuel-virtual'
- 'deploy-virtual':
slave-label: 'fuel-virtual'
- - 'smoke-test':
- slave-label: 'fuel-virtual'
#####################################
# jobs
#####################################
@@ -105,15 +101,18 @@
installer: '{installer}'
- '{installer}-defaults':
gs-pathname: '{gs-pathname}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
builders:
- description-setter:
description: "Built on $NODE_NAME"
- multijob:
- name: basic
+ name: deploy-virtual
condition: SUCCESSFUL
projects:
- - name: 'fuel-verify-basic-{stream}'
+ - name: 'fuel-verify-deploy-virtual-{stream}'
current-parameters: false
predefined-parameters: |
BRANCH=$BRANCH
@@ -123,33 +122,37 @@
node-parameters: false
kill-phase-on: FAILURE
abort-all-job: true
+
- multijob:
- name: deploy-virtual
+ name: smoke-test
condition: SUCCESSFUL
projects:
- - name: 'fuel-verify-deploy-virtual-{stream}'
+ # Use Functest job definition from jjb/functest/functest-daily-jobs
+ - name: 'functest-fuel-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=tier
+ FUNCTEST_TIER=healthcheck
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- - multijob:
- name: smoke-test
- condition: SUCCESSFUL
- projects:
- - name: 'fuel-verify-smoke-test-{stream}'
+ - name: 'functest-fuel-virtual-suite-{stream}'
current-parameters: false
predefined-parameters: |
+ FUNCTEST_MODE=testcase
+ FUNCTEST_SUITE_NAME=vping_ssh
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
BRANCH=$BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- node-parameters: false
- kill-phase-on: FAILURE
+ node-parameters: true
+ kill-phase-on: NEVER
abort-all-job: true
- job-template:
@@ -170,7 +173,6 @@
use-build-blocker: true
blocking-jobs:
- 'fuel-verify-deploy-.*'
- - 'fuel-verify-test-.*'
block-level: 'NODE'
scm:
@@ -200,23 +202,7 @@
# builder macros
#####################################
- builder:
- name: 'fuel-verify-basic-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"
-
-- builder:
name: 'fuel-verify-deploy-virtual-macro'
builders:
- shell:
!include-raw: ./fuel-deploy.sh
-
-- builder:
- name: 'fuel-verify-smoke-test-macro'
- builders:
- - shell: |
- #!/bin/bash
-
- echo "Not activated!"