diff options
| -rw-r--r-- | jjb/compass4nfv/compass4nfv.yml | 16 | ||||
| -rw-r--r-- | jjb/compass4nfv/opnfv-compass4nfv.yml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest.yml | 20 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 2 |
5 files changed, 26 insertions, 16 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 39bbb72ec..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 @@ -132,6 +132,10 @@ name: FUNCTEST_REPO_DIR default: "/home/opnfv/repos/functest" description: "Directory where the Functest repository is cloned" + - string: + name: PUSH_RESULTS_TO_DB + default: "true" + description: "Push the results of all the tests to the resultDB" ######################## # trigger macros ######################## @@ -156,9 +160,12 @@ - shell: | #!/bin/bash set +e - + flag="" + if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then + flag="-r" + fi echo "Functest: run $FUNCTEST_SUITE_NAME" - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME ${flag}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -168,9 +175,12 @@ - shell: | #!/bin/bash set +e - + flag="" + if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then + flag="-r" + fi echo "Functest: running all the tests" - cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh" + cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd 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 |