diff options
| -rw-r--r-- | jjb/apex/apex.yml | 15 | ||||
| -rw-r--r-- | utils/test/reporting/functest/reporting-status.py | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index fc0fd4bf9..0ef6831e7 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -216,7 +216,7 @@ - trigger-builds: - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream1}' predefined-parameters: | - BUILD_DIRECTORY=apex-verify-{stream1}/build_output + BUILD_DIRECTORY=apex-verify-{stream1} OPNFV_CLEAN=yes git-revision: false block: true @@ -226,6 +226,13 @@ # DEPLOY_SCENARIO=os-nosdn-nofeature-ha # FUNCTEST_SUITE_NAME=vping_userdata # block: true + - trigger-builds: + - project: 'apex-deploy-virtual-os-odl_l2-nofeature-ha-{stream1}' + predefined-parameters: | + BUILD_DIRECTORY=apex-verify-{stream1} + OPNFV_CLEAN=yes + git-revision: false + block: true - 'apex-workspace-cleanup' - job-template: @@ -329,7 +336,7 @@ - trigger-builds: - project: 'apex-deploy-virtual-os-nosdn-nofeature-ha-{stream}' predefined-parameters: | - BUILD_DIRECTORY=apex-build-{stream}/build_output + BUILD_DIRECTORY=apex-build-{stream} OPNFV_CLEAN=yes git-revision: false block: true @@ -892,7 +899,7 @@ # use local build for verify if [[ $BUILD_DIRECTORY == *verify-master* ]]; then if [ ! -e "${WORKSPACE}/build/lib" ]; then ln -s ${WORKSPACE}/lib ${WORKSPACE}/build/lib; fi - DEPLOY_CMD="./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/" + DEPLOY_CMD="CONFIG=${WORKSPACE}/build RESOURCES=${WORKSPACE}/build/images/ ./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/" DEPLOY_FILE="${WORKSPACE}/config/deploy/${DEPLOY_SCENARIO}.yaml" NETWORK_FILE="${WORKSPACE}/config/network/network_settings.yaml" # Make sure python34 is installed @@ -941,7 +948,7 @@ if [ "$OPNFV_CLEAN" == 'yes' ]; then if [[ $BUILD_DIRECTORY == *verify-master* ]]; then - sudo ./clean.sh + sudo CONFIG=../lib ./clean.sh else sudo opnfv-clean fi diff --git a/utils/test/reporting/functest/reporting-status.py b/utils/test/reporting/functest/reporting-status.py index e6ea1b4b8..9271717bb 100644 --- a/utils/test/reporting/functest/reporting-status.py +++ b/utils/test/reporting/functest/reporting-status.py @@ -256,7 +256,7 @@ tempest = TestCase("Tempest", "functest", -1) # Retrieve the Functest configuration to detect which tests are relevant # according to the installer, scenario -cf = "https://git.opnfv.org/cgit/functest/plain/testcases/config_functest.yaml" +cf = "https://git.opnfv.org/cgit/functest/plain/ci/config_functest.yaml" response = requests.get(cf) functest_yaml_config = yaml.load(response.text) |