From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Tue, 25 Sep 2018 18:19:17 +0000 (+0000)
Subject: Merge "Pharos Dashboard Container Builds"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=133e35d5d89e48e46d3e5818a9e70dac84827334;hp=dd0b6d1915fd9f39a286387859e4501f0fb94683

Merge "Pharos Dashboard Container Builds"
---

diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml
index 069a5d25e..9ebaea97b 100644
--- a/jjb/container4nfv/container4nfv-arm64.yaml
+++ b/jjb/container4nfv/container4nfv-arm64.yaml
@@ -33,7 +33,7 @@
 
     wrappers:
       - timeout:
-          timeout: 210
+          timeout: 300
           fail: true
 
     scm:
@@ -63,6 +63,8 @@
               unstable-threshold: 'Failure'
           - project: functest-compass-arm-virtual-daily-master
             current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
             same-node: true
             block: true
             block-thresholds:
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 4e23d44fe..c82147489 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -26,14 +26,10 @@ check_os_deployment() {
 
 }
 
-
 run_tiers() {
     tiers=$1
     cmd_opt="run_tests -r -t all"
     [[ $BUILD_TAG =~ "suite" ]] && cmd_opt="run_tests -t all"
-    ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
-    echo 0 > ${ret_val_file}
-
     for tier in ${tiers[@]}; do
         FUNCTEST_IMAGE=${REPO}/functest-${tier}:${DOCKER_TAG}
         echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
@@ -55,8 +51,6 @@ run_tiers() {
 run_test() {
     test_name=$1
     cmd_opt="run_tests -t ${test_name}"
-    ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
-    echo 0 > ${ret_val_file}
     # 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)
@@ -158,6 +152,9 @@ fi
 
 volumes="${images_vol} ${results_vol} ${sshkey_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}"
 
+ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
+echo 0 > ${ret_val_file}
+
 set +e
 
 if [ ${FUNCTEST_MODE} == 'testcase' ]; then
diff --git a/jjb/openci/openci-opnfv-daily-jobs.yaml b/jjb/openci/openci-opnfv-daily-jobs.yaml
index ad2bce0a3..afa8effea 100644
--- a/jjb/openci/openci-opnfv-daily-jobs.yaml
+++ b/jjb/openci/openci-opnfv-daily-jobs.yaml
@@ -44,7 +44,9 @@
           name: SCENARIO_METADATA_LOCATION
           default: https://url/to/scenario/metadata/on/opnfv/artifact/repo/$BUILD_NUMBER
           description: 'The location of the scenario metadata'
-      - 'ericsson-build4-defaults'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
 
     wrappers:
       - credentials-binding:
@@ -99,7 +101,9 @@
           name: CONFIDENCE_LEVEL
           default: "'opnfvdaily': 'SUCCESS'"
           description: 'The confidence level the published artifact gained'
-      - 'ericsson-build4-defaults'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
 
     wrappers:
       - credentials-binding:
diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index fc99bd392..bfb9d63ec 100644
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -84,9 +84,15 @@
           if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then
               cd docs/submodules/$GERRIT_PROJECT
               git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
+              cd -
           else
               git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
           fi
+          if [ -d docs/subdmodules ]; then
+              for project in docs/submodules/*; do
+                  cd $project && git submodule deinit -f . && cd -
+              done
+          fi
       - shell: |
           sudo -H pip install virtualenv
           virtualenv $WORKSPACE/venv