summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/compass4nfv/compass4nfv.yml16
-rw-r--r--jjb/compass4nfv/opnfv-compass4nfv.yml2
-rw-r--r--jjb/functest/functest.yml12
-rw-r--r--jjb/functest/res-build.sh6
-rw-r--r--jjb/opnfv/installer-params.yml2
-rw-r--r--jjb/yardstick/yardstick.yml2
6 files changed, 23 insertions, 17 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 40402011c..1a0a6f746 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -7,8 +7,8 @@
jobs:
- 'compass-verify-{stream}'
- 'compass-daily-{stream}'
- - 'compass-build-iso'
- - 'compass-build-ppa'
+ - 'compass-build-iso-{stream}'
+ - 'compass-build-ppa-{stream}'
- 'compass-deploy-virtual-{flavor}'
- 'compass-deploy-bare-huawei-us'
@@ -56,7 +56,7 @@
- project-parameter:
project: '{project}'
- gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- compass-parameter:
installer: '{installer}'
- string:
@@ -86,7 +86,7 @@
project-pattern: '{project}'
branches:
- branch-compare-type: 'ANT'
- branch-pattern: '**/master'
+ branch-pattern: '**/{branch}'
forbidden-file-paths:
- compare-type: ANT
pattern: 'docs/**|.gitignore'
@@ -147,7 +147,7 @@
block: true
- job-template:
- name: 'compass-build-iso'
+ name: 'compass-build-iso-{stream}'
node: ericsson-build
@@ -169,7 +169,7 @@
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch: 'master'
+ branch: '{branch}'
builders:
- 'builder-compass-build-iso'
@@ -177,7 +177,7 @@
- 'builder-compass-workspace-cleanup'
- job-template:
- name: 'compass-build-ppa'
+ name: 'compass-build-ppa-{stream}'
description: "build ppa(using docker) in huawei lab"
@@ -201,7 +201,7 @@
- git-scm:
credentials-id: '{ssh-credentials}'
refspec: ''
- branch: 'master'
+ branch: '{branch}'
triggers:
- timed: 'H 16 * * *'
diff --git a/jjb/compass4nfv/opnfv-compass4nfv.yml b/jjb/compass4nfv/opnfv-compass4nfv.yml
index bebcf1f99..c647abcf8 100644
--- a/jjb/compass4nfv/opnfv-compass4nfv.yml
+++ b/jjb/compass4nfv/opnfv-compass4nfv.yml
@@ -5,7 +5,7 @@
name: 'opnfv-compass4nfv'
- installer: 'compass4nfv'
+ installer: 'compass'
controller:
- 'odl'
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index c77a1fac9..e1dff72e4 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -16,7 +16,7 @@
- orange-pod2:
installer: joid
- huawei-us-deploy-bare-1:
- installer: compass4nfv
+ installer: compass
- intel-pod5:
installer: joid
@@ -152,7 +152,7 @@
- 'functest-cleanup'
- 'set-functest-env'
- 'functest-all'
-# - 'functest-store-results'
+ - 'functest-store-results'
- builder:
name: functest-suite-builder
@@ -204,8 +204,14 @@
labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
fi
+ dir_result="${HOME}/opnfv/functest/reports"
+ mkdir -f ${dir_result}
+ rm -rf ${dir_result}/*
+
+ $res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+
docker pull opnfv/functest:latest_stable
- cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"
+ cmd="docker run -id -e $envs ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
${cmd}
docker ps -a
diff --git a/jjb/functest/res-build.sh b/jjb/functest/res-build.sh
index a9c5dbe1b..9d425773d 100644
--- a/jjb/functest/res-build.sh
+++ b/jjb/functest/res-build.sh
@@ -7,9 +7,9 @@ export PATH=$PATH:/usr/local/bin/
git_sha1="$(git rev-parse HEAD)"
res_build_date=$(date -u +"%Y-%m-%d_%H-%M-%S")
-# Result directory in the docker file
+# Result directory in the jumphost
# to be used only with CI
-dir_result="/home/opnfv/functest/results"
+dir_result="${HOME}/opnfv/functest/reports"
# Clean the results directory
# remove json file for rally, export only html
@@ -20,7 +20,7 @@ rm -f $dir_result/rally/*.json
# date is generated by functest so on the artifact, the results shall be under functest/<testbed id>/date/
testbed=$NODE_NAME
-project_artifact=functest/$testbed/$res_build_date
+project_artifact=logs/functest/$testbed/$res_build_date
# copy folder to artifact
if [ -d "$dir_result" ]; then
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 26feee43d..956e67da8 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -19,7 +19,7 @@
description: 'Controller name'
- parameter:
- name: 'compass4nfv-defaults'
+ name: 'compass-defaults'
parameters:
- string:
name: INSTALLER_IP
diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml
index 4c4997731..e5c306a56 100644
--- a/jjb/yardstick/yardstick.yml
+++ b/jjb/yardstick/yardstick.yml
@@ -9,7 +9,7 @@
- ericsson-pod1:
installer: fuel
- huawei-us-deploy-bare-1:
- installer: compass4nfv
+ installer: compass
loop:
- daily