summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xjjb/apex/apex-deploy.sh19
-rwxr-xr-xjjb/apex/apex-download-artifact.sh17
-rw-r--r--jjb/apex/apex-verify-jobs.yml14
-rw-r--r--jjb/apex/scenarios.yaml.hidden3
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml11
-rw-r--r--jjb/doctor/doctor.yml31
-rw-r--r--jjb/domino/domino.yml4
-rw-r--r--jjb/ovn4nfv/ovn4nfv-project-jobs.yml4
-rw-r--r--jjb/qtip/qtip-experimental-jobs.yml6
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml15
-rw-r--r--jjb/sfc/sfc-project-jobs.yml4
-rw-r--r--jjb/vswitchperf/vswitchperf.yml4
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml5
13 files changed, 48 insertions, 89 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 94d464259..958e4bf5e 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -13,21 +13,8 @@ echo
if [ -z "$DEPLOY_SCENARIO" ]; then
echo "Deploy scenario not set!"
exit 1
-elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
- echo "Detecting Gating scenario..."
- if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then
- echo "ERROR: Gate job triggered without comment!"
- exit 1
- else
- DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$')
- if [ -z "$DEPLOY_SCENARIO" ]; then
- echo "ERROR: Unable to detect scenario in Gerrit Comment!"
- echo "Format of comment to trigger gate should be 'start-gate-scenario: <scenario>'"
- exit 1
- else
- echo "Gate scenario detected: ${DEPLOY_SCENARIO}"
- fi
- fi
+else
+ echo "Deploy scenario: ${DEPLOY_SCENARIO}"
fi
# Dev or RPM/ISO build
@@ -143,8 +130,6 @@ fi
if [ "$IPV6_FLAG" == "True" ]; then
NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml"
-elif echo ${DEPLOY_SCENARIO} | grep fdio; then
- NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_vpp.yaml"
else
NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
fi
diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh
index 066d61203..6c0f8fe26 100755
--- a/jjb/apex/apex-download-artifact.sh
+++ b/jjb/apex/apex-download-artifact.sh
@@ -13,21 +13,8 @@ echo
if [ -z "$DEPLOY_SCENARIO" ]; then
echo "Deploy scenario not set!"
exit 1
-elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
- echo "Detecting Gating scenario..."
- if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then
- echo "ERROR: Gate job triggered without comment!"
- exit 1
- else
- DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$')
- if [ -z "$DEPLOY_SCENARIO" ]; then
- echo "ERROR: Unable to detect scenario in Gerrit Comment!"
- echo "Format of comment to trigger gate should be 'start-gate-scenario: <scenario>'"
- exit 1
- else
- echo "Gate scenario detected: ${DEPLOY_SCENARIO}"
- fi
- fi
+else
+ echo "Deploy scenario: ${DEPLOY_SCENARIO}"
fi
# if upstream we do not need to download anything
diff --git a/jjb/apex/apex-verify-jobs.yml b/jjb/apex/apex-verify-jobs.yml
index 79b358815..6b7271f7e 100644
--- a/jjb/apex/apex-verify-jobs.yml
+++ b/jjb/apex/apex-verify-jobs.yml
@@ -315,6 +315,12 @@
option: 'project'
builders:
+ # yamllint disable rule:line-length
+ - shell: |
+ echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os|k8s-.*$') > detected_scenario
+ # yamllint enable rule:line-length
+ - inject:
+ properties-file: detected_scenario
- multijob:
name: deploy-virtual
condition: SUCCESSFUL
@@ -323,7 +329,7 @@
current-parameters: false
predefined-parameters: |
ARTIFACT_VERSION=$ARTIFACT_VERSION
- DEPLOY_SCENARIO=gate
+ DEPLOY_SCENARIO=$DEPLOY_SCENARIO
OPNFV_CLEAN=yes
GERRIT_BRANCH=$GERRIT_BRANCH
GERRIT_REFSPEC=$GERRIT_REFSPEC
@@ -334,12 +340,6 @@
kill-phase-on: FAILURE
abort-all-job: true
git-revision: true
- # yamllint disable rule:line-length
- - shell: |
- echo DEPLOY_SCENARIO=$(echo $GERRIT_EVENT_COMMENT_TEXT | grep start-gate-scenario | grep -Eo 'os-.*') > detected_scenario
- # yamllint enable rule:line-length
- - inject:
- properties-file: detected_scenario
- multijob:
name: functest-smoke
condition: ALWAYS
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index bc2be4a8d..91cd789c5 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -12,11 +12,8 @@ fraser:
- 'os-nosdn-fdio-ha'
- 'os-nosdn-bar-ha'
- 'os-nosdn-bar-noha'
- - 'os-nosdn-nofeature-ha-ipv6'
- 'os-nosdn-ovs_dpdk-noha'
- 'os-nosdn-ovs_dpdk-ha'
- - 'os-nosdn-kvm_ovs_dpdk-noha'
- - 'os-nosdn-kvm_ovs_dpdk-ha'
- 'os-odl-sfc-noha'
- 'os-odl-sfc-ha'
- 'os-nosdn-calipso-noha'
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 0f2d917c3..4eaa39ae9 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -156,9 +156,6 @@
- condition-kind: regex-match
regex: 'baremetal'
label: '{pod}'
- - condition-kind: regex-match
- regex: 'master'
- label: '{stream}'
steps:
- trigger-builds:
- project: 'yardstick-daisy-{pod}-daily-{stream}'
@@ -242,7 +239,7 @@
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 12 * * *'
+ - timed: ''
# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
@@ -252,7 +249,7 @@
- trigger:
name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- - timed: '0 18 * * *'
+ - timed: ''
# ovs_dpdk Scenarios
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
@@ -290,7 +287,7 @@
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- - timed: '0 0 * * *'
+ - timed: '0 0,6 * * *'
# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
@@ -300,7 +297,7 @@
- trigger:
name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
triggers:
- - timed: '0 20 * * *'
+ - timed: '0 12,18 * * *'
# ovs_dpdk Scenarios
- trigger:
name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index c3760a739..5732100be 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -16,10 +16,15 @@
docker-tag: 'stable'
disabled: false
+ # feature projects' tests are not triggered by functest
+ # doctor verify Pods need to deploy with these scenario
installer:
- - 'apex'
- - 'fuel'
- - 'daisy'
+ - 'apex':
+ scenario: 'os-nosdn-kvm-ha'
+ - 'fuel':
+ scenario: 'os-nosdn-ovs-ha'
+ - 'daisy':
+ scenario: 'os-nosdn-ovs_dpdk-noha'
arch:
- 'x86_64'
@@ -63,7 +68,7 @@
# in phase jobs
echo "Triggering phase jobs!"
- multijob:
- name: 'doctor-verify-apex-inspector'
+ name: 'doctor-verify'
execution-type: PARALLEL
projects:
- name: 'doctor-verify-apex-{inspector}-x86_64-{stream}'
@@ -74,12 +79,7 @@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
- - multijob:
- name: 'doctor-verify-fuel-inspector'
- execution-type: PARALLEL
- projects:
- name: 'doctor-verify-fuel-{inspector}-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
@@ -88,12 +88,7 @@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
- - multijob:
- name: 'doctor-verify-fuel-inspector'
- execution-type: PARALLEL
- projects:
- name: 'doctor-verify-fuel-{inspector}-aarch64-{stream}'
predefined-parameters: |
GERRIT_BRANCH=$GERRIT_BRANCH
@@ -101,12 +96,7 @@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
- - multijob:
- name: 'doctor-verify-daisy-inspector'
- execution-type: PARALLEL
- projects:
- name: 'doctor-verify-daisy-{inspector}-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
@@ -115,7 +105,6 @@
GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
- current-parameters: true
git-revision: true
- job-template:
@@ -162,7 +151,7 @@
description: 'Remove downloaded docker images (opnfv/functest:*)'
- string:
name: DEPLOY_SCENARIO
- default: 'os-nosdn-nofeature-ha'
+ default: '{scenario}'
description: 'Scenario to deploy and test'
- parameter:
diff --git a/jjb/domino/domino.yml b/jjb/domino/domino.yml
index 7fc818c7a..e91260463 100644
--- a/jjb/domino/domino.yml
+++ b/jjb/domino/domino.yml
@@ -12,10 +12,6 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - euphrates:
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- job-template:
name: 'domino-verify-{stream}'
diff --git a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml
index 0316ff70e..2ce4b6df9 100644
--- a/jjb/ovn4nfv/ovn4nfv-project-jobs.yml
+++ b/jjb/ovn4nfv/ovn4nfv-project-jobs.yml
@@ -13,10 +13,6 @@
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- - euphrates:
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
jobs:
- 'ovn4nfv-build-{stream}'
diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index b130912f3..4e79c0553 100644
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -15,9 +15,9 @@
disabled: false
pod:
- - zte-virtual6:
- installer: fuel
- pod: zte-virtual6
+ - zte-virtual5:
+ installer: apex
+ pod: zte-virtual5
################################
## job templates
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index f20b321ad..0fc623c74 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -44,6 +44,21 @@
pod: zte-virtual6
sut: vnf
<<: *master
+ - compute:
+ installer: apex
+ pod: zte-virtual5
+ sut: node
+ <<: *fraser
+ - storage:
+ installer: apex
+ pod: zte-virtual5
+ sut: ''
+ <<: *fraser
+ - compute:
+ installer: fuel
+ pod: zte-virtual6
+ sut: vnf
+ <<: *fraser
# -------------------------------
diff --git a/jjb/sfc/sfc-project-jobs.yml b/jjb/sfc/sfc-project-jobs.yml
index 1fb4d990a..fea792467 100644
--- a/jjb/sfc/sfc-project-jobs.yml
+++ b/jjb/sfc/sfc-project-jobs.yml
@@ -20,10 +20,6 @@
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- - euphrates:
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- job-template:
name: 'sfc-verify-{stream}'
diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 01a154aec..ba0742f3b 100644
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -19,10 +19,6 @@
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
- - euphrates:
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- job-template:
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 2eaa0feb1..fefa8e68a 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -140,6 +140,11 @@
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
+ - baremetal:
+ slave-label: daisy-baremetal
+ installer: daisy
+ auto-trigger-name: 'daily-trigger-disabled'
+ <<: *fraser
- virtual:
slave-label: daisy-virtual
installer: daisy