summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INFO1
-rw-r--r--jjb/apex/apex.yml25
-rw-r--r--jjb/apex/apex.yml.j23
-rw-r--r--jjb/apex/scenarios.yaml.hidden2
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml31
-rwxr-xr-xjjb/daisy4nfv/daisy-deploy.sh2
-rw-r--r--jjb/doctor/doctor.yml8
-rw-r--r--jjb/nfvbench/nfvbench.yml90
-rw-r--r--jjb/qtip/qtip-integration-jobs.yml2
-rw-r--r--jjb/xci/bifrost-cleanup-job.yml8
-rw-r--r--jjb/xci/bifrost-periodic-jobs.yml2
-rwxr-xr-xjjb/xci/bifrost-provision.sh10
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml8
-rwxr-xr-xjjb/xci/bifrost-verify.sh6
-rw-r--r--jjb/xci/osa-periodic-jobs.yml2
-rw-r--r--jjb/xci/xci-daily-jobs.yml2
-rwxr-xr-xjjb/xci/xci-deploy.sh4
-rwxr-xr-xutils/test/reporting/reporting/functest/reporting-status.py2
-rw-r--r--utils/test/reporting/reporting/functest/template/index-status-tmpl.html1
-rw-r--r--utils/test/reporting/reporting/reporting.yaml1
20 files changed, 153 insertions, 57 deletions
diff --git a/INFO b/INFO
index 0fb358217..38ac5b3d2 100644
--- a/INFO
+++ b/INFO
@@ -9,6 +9,7 @@ Jira Project Prefix: RELENG
Mailing list tag: [releng]
IRC: Server:freenode.net Channel:#opnfv-octopus
Repository: releng
+Other Repositories: releng-xci
Committers:
Fatih Degirmenci (Ericsson, fatih.degirmenci@ericsson.com)
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 26eddb5b2..07181fcad 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -132,6 +132,10 @@
<<: *master
- 'os-odl-sfc-ha':
<<: *master
+ - 'os-odl-fdio-dvr-noha':
+ <<: *master
+ - 'os-odl-fdio-dvr-ha':
+ <<: *master
platform:
- 'baremetal'
@@ -669,7 +673,7 @@
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
- multijob:
name: 'Baremetal Deploy'
- condition: ALWAYS
+ condition: SUCCESSFUL
projects:
- name: 'apex-deploy-baremetal-{scenario_stream}'
node-parameters: true
@@ -684,7 +688,6 @@
git-revision: false
- multijob:
name: 'OPNFV Test Suite'
- condition: SUCCESSFUL
projects:
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
@@ -1332,6 +1335,24 @@
abort-all-job: true
git-revision: false
+ - name: 'apex-os-odl-fdio-dvr-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-fdio-dvr-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
+
# snapshot create
diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 5d7f150cd..2d760f854 100644
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -585,7 +585,7 @@
description: "Deployed on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
- multijob:
name: 'Baremetal Deploy'
- condition: ALWAYS
+ condition: SUCCESSFUL
projects:
- name: 'apex-deploy-baremetal-{scenario_stream}'
node-parameters: true
@@ -600,7 +600,6 @@
git-revision: false
- multijob:
name: 'OPNFV Test Suite'
- condition: SUCCESSFUL
projects:
- name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
node-parameters: true
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index f49fa83c7..def4e796a 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -18,6 +18,8 @@ master:
- 'os-nosdn-kvm_ovs_dpdk-ha'
- 'os-odl-sfc-noha'
- 'os-odl-sfc-ha'
+ - 'os-odl-fdio-dvr-noha'
+ - 'os-odl-fdio-dvr-ha'
danube:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 6524d2051..d7c1acbe0 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -46,10 +46,7 @@
- 'os-nosdn-nofeature-noha':
auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
# ODL_L3 scenarios
- - 'os-odl_l3-nofeature-ha':
- auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
- # ODL_L2 scenarios
- - 'os-odl_l2-nofeature-ha':
+ - 'os-odl-nofeature-ha':
auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
jobs:
@@ -180,46 +177,36 @@
#-----------------------------------------------
# Triggers for job running on daisy-baremetal against master branch
#-----------------------------------------------
-# HA Scenarios
+# Basic HA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 12 * * *'
-# NOHA Scenarios
+# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
triggers:
- timed: ''
-# ODL_L3 Scenarios
+# ODL Scenarios
- trigger:
- name: 'daisy-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
+ name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
triggers:
- timed: '0 16 * * *'
-# ODL_L2 Scenarios
-- trigger:
- name: 'daisy-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
- triggers:
- - timed: ''
#-----------------------------------------------
# Triggers for job running on daisy-virtual against master branch
#-----------------------------------------------
+# Basic HA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: '0 12 * * *'
-# NOHA Scenarios
+# Basic NOHA Scenarios
- trigger:
name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
triggers:
- timed: ''
-# ODL_L3 Scenarios
+# ODL Scenarios
- trigger:
- name: 'daisy-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
+ name: 'daisy-os-odl-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: '0 16 * * *'
-# ODL_L3 Scenarios
-- trigger:
- name: 'daisy-os-odl_l2-nofeature-ha-virtual-daily-master-trigger'
- triggers:
- - timed: ''
-
diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh
index 785f3a571..0bcac4b02 100755
--- a/jjb/daisy4nfv/daisy-deploy.sh
+++ b/jjb/daisy4nfv/daisy-deploy.sh
@@ -28,7 +28,7 @@ git clone ssh://jenkins-zte@gerrit.opnfv.org:29418/securedlab --quiet \
# daisy ci/deploy/deploy.sh use $BASE_DIR/labs dir
cp -r securedlab/labs .
-DEPLOY_COMMAND="sudo ./ci/deploy/deploy.sh -b $BASE_DIR \
+DEPLOY_COMMAND="sudo -E ./ci/deploy/deploy.sh -b $BASE_DIR \
-l $LAB_NAME -p $POD_NAME -B $BRIDGE -s $DEPLOY_SCENARIO"
# log info to console
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index afde9efe8..23d12def4 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -30,15 +30,9 @@
task:
- verify:
- profiler: 'none'
auto-trigger-name: 'doctor-verify'
is-python: false
- - profiling:
- profiler: 'poc'
- auto-trigger-name: 'experimental'
- is-python: false
- python-verify:
- profiler: 'none'
auto-trigger-name: 'doctor-verify'
is-python: true
@@ -153,7 +147,7 @@
default: 'doctor-notification'
- string:
name: TESTCASE_OPTIONS
- default: '-e INSPECTOR_TYPE={inspector} -e PROFILER_TYPE={profiler} -e PYTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
+ default: '-e INSPECTOR_TYPE={inspector} -e PYTHON_ENABLE={is-python} -v $WORKSPACE:/home/opnfv/repos/doctor'
description: 'Addtional parameters specific to test case(s)'
# functest-parameter
- string:
diff --git a/jjb/nfvbench/nfvbench.yml b/jjb/nfvbench/nfvbench.yml
new file mode 100644
index 000000000..85486c8a8
--- /dev/null
+++ b/jjb/nfvbench/nfvbench.yml
@@ -0,0 +1,90 @@
+- project:
+ name: nfvbench
+
+ project: '{name}'
+
+ jobs:
+ - 'nfvbench-build-{stream}'
+ - 'nfvbench-verify-{stream}'
+
+ stream:
+ - master:
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+ docker-tag: 'latest'
+
+- job-template:
+ name: 'nfvbench-build-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - git-scm-gerrit
+
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - comment-added-contains-event:
+ comment-contains-value: 'buildvm'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+
+ builders:
+ - shell: |
+ cd $WORKSPACE/nfvbenchvm/dib
+ bash build-image.sh
+
+- job-template:
+ name: 'nfvbench-verify-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - git-scm-gerrit
+
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+
+ builders:
+ - shell: |
+ echo "pass"
+
+
diff --git a/jjb/qtip/qtip-integration-jobs.yml b/jjb/qtip/qtip-integration-jobs.yml
index 46c101d7a..4382dff3e 100644
--- a/jjb/qtip/qtip-integration-jobs.yml
+++ b/jjb/qtip/qtip-integration-jobs.yml
@@ -45,4 +45,4 @@
set -o pipefail
set -o xtrace
- source integration/storperf/storperf.sh
+ source integration/storperf/run_ci.sh
diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml
index 998464a5e..6f3f51a6d 100644
--- a/jjb/xci/bifrost-cleanup-job.yml
+++ b/jjb/xci/bifrost-cleanup-job.yml
@@ -15,8 +15,8 @@
project-repo: 'https://git.openstack.org/openstack/bifrost'
clone-location: '/opt/bifrost'
- 'opnfv':
- project-repo: 'https://gerrit.opnfv.org/gerrit/releng'
- clone-location: '/opt/releng'
+ project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+ clone-location: '/opt/releng-xci'
#--------------------------------
# jobs
@@ -132,11 +132,11 @@
silent-start: true
projects:
- project-compare-type: 'ANT'
- project-pattern: 'releng'
+ project-pattern: 'releng-xci'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: 'prototypes/bifrost/**'
+ pattern: 'bifrost/**'
readable-message: true
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index 9773cfd9e..7ef11a4cf 100644
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -1,5 +1,5 @@
- project:
- project: 'releng'
+ project: 'releng-xci'
name: 'bifrost-periodic'
#--------------------------------
diff --git a/jjb/xci/bifrost-provision.sh b/jjb/xci/bifrost-provision.sh
index b37da9059..4d646a676 100755
--- a/jjb/xci/bifrost-provision.sh
+++ b/jjb/xci/bifrost-provision.sh
@@ -38,7 +38,7 @@ if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
fi
# remove previously cloned repos
-sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng /opt/functest
+sudo /bin/rm -rf /opt/bifrost /opt/openstack-ansible /opt/releng-xci /opt/functest
# Fix up permissions
fix_ownership
@@ -65,16 +65,16 @@ cd /opt/bifrost && sudo git checkout --quiet $OPENSTACK_BIFROST_VERSION
echo "xci: using bifrost commit"
git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
-sudo git clone --quiet https://gerrit.opnfv.org/gerrit/releng /opt/releng
-cd /opt/releng && sudo git checkout --quiet $OPNFV_RELENG_VERSION
+sudo git clone --quiet https://gerrit.opnfv.org/gerrit/releng-xci /opt/releng-xci
+cd /opt/releng-xci && sudo git checkout --quiet $OPNFV_RELENG_VERSION
echo "xci: using releng commit"
git show --oneline -s --pretty=format:'%h - %s (%cr) <%an>'
# source flavor vars
-source "$WORKSPACE/prototypes/xci/config/${XCI_FLAVOR}-vars"
+source "$WORKSPACE/xci/config/${XCI_FLAVOR}-vars"
# combine opnfv and upstream scripts/playbooks
-sudo /bin/cp -rf /opt/releng/prototypes/bifrost/* /opt/bifrost/
+sudo /bin/cp -rf /opt/releng-xci/bifrost/* /opt/bifrost/
# cleanup remnants of previous deployment
cd /opt/bifrost
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index fbe7ecf41..507147684 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -14,8 +14,8 @@
project-repo: 'https://git.openstack.org/openstack/bifrost'
clone-location: '$WORKSPACE/bifrost'
- 'opnfv':
- project-repo: 'https://gerrit.opnfv.org/gerrit/releng'
- clone-location: '$WORKSPACE/releng'
+ project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+ clone-location: '$WORKSPACE/releng-xci'
#--------------------------------
# distros
#--------------------------------
@@ -220,13 +220,13 @@
custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
projects:
- project-compare-type: 'ANT'
- project-pattern: 'releng'
+ project-pattern: 'releng-xci'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: 'prototypes/bifrost/**'
+ pattern: 'bifrost/**'
readable-message: true
#---------------------------
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index b522b8969..14c8d37e9 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -95,21 +95,21 @@ if [[ ! "$DISTRO" =~ (xenial|centos7|suse) ]]; then
fi
# remove previously cloned repos
-/bin/rm -rf $WORKSPACE/bifrost $WORKSPACE/releng
+/bin/rm -rf $WORKSPACE/bifrost $WORKSPACE/releng-xci
# Fix up permissions
fix_ownership
# clone all the repos first and checkout the patch afterwards
git clone https://git.openstack.org/openstack/bifrost $WORKSPACE/bifrost
-git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng
+git clone https://gerrit.opnfv.org/gerrit/releng-xci $WORKSPACE/releng-xci
# checkout the patch
cd $CLONE_LOCATION
git fetch $PROJECT_REPO $GERRIT_REFSPEC && sudo git checkout FETCH_HEAD
# combine opnfv and upstream scripts/playbooks
-/bin/cp -rf $WORKSPACE/releng/prototypes/bifrost/* $WORKSPACE/bifrost/
+/bin/cp -rf $WORKSPACE/releng-xci/bifrost/* $WORKSPACE/bifrost/
# cleanup remnants of previous deployment
cd $WORKSPACE/bifrost
diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml
index 722b077ac..350ee766b 100644
--- a/jjb/xci/osa-periodic-jobs.yml
+++ b/jjb/xci/osa-periodic-jobs.yml
@@ -1,5 +1,5 @@
- project:
- project: 'releng'
+ project: 'releng-xci'
name: 'os-periodic'
#--------------------------------
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index b582772c2..42079b2f5 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -6,7 +6,7 @@
# are checked out based on what is configured.
#--------------------------------
- project:
- project: 'releng'
+ project: 'releng-xci'
name: 'xci-daily'
#--------------------------------
diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 8ad637805..211d282d3 100755
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -11,7 +11,7 @@ set -o errexit
set -o nounset
set -o pipefail
-cd $WORKSPACE/prototypes/xci
+cd $WORKSPACE/xci
# for daily jobs, we want to use working versions
# for periodic jobs, we will use whatever is set in the job, probably master
@@ -53,7 +53,7 @@ if [[ "$XCI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
fi
# proceed with the deployment
-cd $WORKSPACE/prototypes/xci
+cd $WORKSPACE/xci
./xci-deploy.sh
if [[ "$JOB_NAME" =~ "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
diff --git a/utils/test/reporting/reporting/functest/reporting-status.py b/utils/test/reporting/reporting/functest/reporting-status.py
index 48c4bb1c7..c7c2051a3 100755
--- a/utils/test/reporting/reporting/functest/reporting-status.py
+++ b/utils/test/reporting/reporting/functest/reporting-status.py
@@ -126,7 +126,7 @@ for version in versions:
# in case of more than 1 architecture supported
# precise the architecture
installer_display = installer
- if (len(architectures) > 1):
+ if "fuel" in installer:
installer_display = installer + "@" + architecture
# For all the scenarios get results
diff --git a/utils/test/reporting/reporting/functest/template/index-status-tmpl.html b/utils/test/reporting/reporting/functest/template/index-status-tmpl.html
index cc4edaac5..74d410e96 100644
--- a/utils/test/reporting/reporting/functest/template/index-status-tmpl.html
+++ b/utils/test/reporting/reporting/functest/template/index-status-tmpl.html
@@ -72,6 +72,7 @@ $(document).ready(function (){
<li class="active"><a href="../../index.html">Home</a></li>
<li><a href="status-apex.html">Apex</a></li>
<li><a href="status-compass.html">Compass</a></li>
+ <li><a href="status-daisy.html">Daisy</a></li>
<li><a href="status-fuel@x86.html">fuel@x86</a></li>
<li><a href="status-fuel@aarch64.html">fuel@aarch64</a></li>
<li><a href="status-joid.html">Joid</a></li>
diff --git a/utils/test/reporting/reporting/reporting.yaml b/utils/test/reporting/reporting/reporting.yaml
index 1692f481d..26feb31d3 100644
--- a/utils/test/reporting/reporting/reporting.yaml
+++ b/utils/test/reporting/reporting/reporting.yaml
@@ -3,6 +3,7 @@ general:
installers:
- apex
- compass
+ - daisy
- fuel
- joid