Merge "Fix ODL restconf port if Compass"

diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 454c690..8fd976a 100644 (file)
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -586,7 +586,8 @@
             echo "DOCKER_TAG=hunter" > functest_scenario
           else
             functest_scenario=$DEPLOY_SCENARIO
-            echo "DOCKER_TAG=''" > functest_scenario
+            echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \
+              echo "latest" || echo ${BRANCH##*/})" > functest_scenario
           fi
           echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
       - inject:

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index daf2ce8..b2deb73 100644 (file)
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -432,7 +432,8 @@
             echo "DOCKER_TAG=hunter" > functest_scenario
           else
             functest_scenario=$DEPLOY_SCENARIO
-            echo "DOCKER_TAG=''" > functest_scenario
+            echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \
+              echo "latest" || echo ${BRANCH##*/})" > functest_scenario
           fi
           echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
       - inject:

diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yaml b/jjb/bottlenecks/bottlenecks-project-jobs.yaml
index d4930d7..dac1659 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-project-jobs.yaml
+++ b/jjb/bottlenecks/bottlenecks-project-jobs.yaml
@@ -21,7 +21,12 @@
           # This is used for different test suite dependent packages storage
           gs-packagepath: '/{suite}'
           disabled: false
-      - fraser: &fraser
+      - gambia:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          gs-packagepath: '/{stream}/{suite}'
+          disabled: false
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           gs-packagepath: '/{stream}/{suite}'
@@ -70,7 +75,6 @@
                   branch-pattern: '**/{branch}'
 
     builders:
-      # - bottlenecks-hello
       - bottlenecks-unit-tests
 
 - job-template:
@@ -103,7 +107,6 @@
 
     builders:
       - bottlenecks-hello
-      # - bottlenecks-unit-tests
 
 - job-template:
     name: 'bottlenecks-{suite}-upload-artifacts-{stream}'

diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 42bf60b..0d9f2ab 100755 (executable)
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -8,10 +8,13 @@ REPO=${REPO:-opnfv}
 CI_LOOP=${CI_LOOP:-daily}
 TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
 ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources
-DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})}
+
+if [ -z $DOCKER_TAG ]; then
+    DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})
+fi
 
 check_os_deployment() {
-    FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG}
+    FUNCTEST_IMAGE=${REPO}/functest-healthcheck:$DOCKER_TAG
     echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
     docker pull ${FUNCTEST_IMAGE}>/dev/null
     cmd="docker run --rm ${volumes} ${FUNCTEST_IMAGE} check_deployment"
@@ -32,7 +35,7 @@ run_tiers() {
     cmd_opt="run_tests -r -t all"
     [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
     for tier in ${tiers[@]}; do
-        FUNCTEST_IMAGE=${REPO}/functest-${tier}:${DOCKER_TAG}
+        FUNCTEST_IMAGE=${REPO}/functest-${tier}:$DOCKER_TAG
         echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
         docker pull ${FUNCTEST_IMAGE}>/dev/null
         cmd="docker run --rm  ${envs} ${volumes} ${TESTCASE_OPTIONS} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
@@ -56,17 +59,17 @@ run_test() {
     # Determine which Functest image should be used for the test case
     case ${test_name} in
         connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check)
-            FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;;
+            FUNCTEST_IMAGE=${REPO}/functest-healthcheck:$DOCKER_TAG ;;
         tempest_smoke_serial|tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican)
-            FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;;
+            FUNCTEST_IMAGE=${REPO}/functest-smoke:$DOCKER_TAG ;;
         shaker|vmtp)
-            FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;;
+            FUNCTEST_IMAGE=${REPO}/functest-benchmarking:$DOCKER_TAG ;;
         tempest_full_parallel|tempest_full|tempest_scenario|rally_full)
-            FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;;
+            FUNCTEST_IMAGE=${REPO}/functest-components:$DOCKER_TAG ;;
         cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc)
-            FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;;
+            FUNCTEST_IMAGE=${REPO}/functest-vnf:$DOCKER_TAG ;;
         doctor-notification|bgpvpn|functest-odl-sfc|barometercollectd|fds|vgpu|stor4nfv_os)
-            FUNCTEST_IMAGE=${REPO}/functest-features:${DOCKER_TAG} ;;
+            FUNCTEST_IMAGE=${REPO}/functest-features:$DOCKER_TAG ;;
         *)
             echo "Unkown test case $test_name"
             exit 1
@@ -123,7 +126,7 @@ mkdir -p ${dir_result}
 sudo rm -rf ${dir_result}/*
 results_vol="-v ${dir_result}:${FUNCTEST_DIR}/results"
 custom_params=
-test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG})
+test -f ${HOME}/opnfv/functest/custom/params_$DOCKER_TAG && custom_params=$(cat ${HOME}/opnfv/functest/custom/params_$DOCKER_TAG)
 
 envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
     -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \

diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh
index 075a622..253cfa7 100644 (file)
--- a/utils/push-test-logs.sh
+++ b/utils/push-test-logs.sh
@@ -29,12 +29,11 @@ node_list=(\
 'ericsson-virtual4' 'ericsson-virtual5' \
 'arm-pod5' 'arm-pod6' \
 'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' \
-'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \
+'huawei-pod6' 'huawei-pod7' 'huawei-pod12' 'huawei-pod8' \
 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \
 'huawei-virtual5' 'huawei-virtual8' 'huawei-virtual9' \
 'zte-pod2' 'zte-pod3' 'zte-pod9' \
-'zte-virtual1' \
-'arm-virtual3')
+'zte-virtual1')
 
 
 if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then