Merge "Remove double slashes when generating the links of the logs in artifact repo"
authorjose.lausuch <jose.lausuch@ericsson.com>
Fri, 2 Sep 2016 13:00:48 +0000 (13:00 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 2 Sep 2016 13:00:48 +0000 (13:00 +0000)
12 files changed:
jjb/armband/armband-ci-jobs.yml
jjb/armband/armband-deploy.sh
jjb/fuel/fuel-ci-jobs.yml
jjb/fuel/fuel-project-jobs.yml
jjb/functest/functest-ci-jobs.yml
jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
jjb/opnfv/slave-params.yml
jjb/releng-macros.yaml
prototypes/bifrost/scripts/test-bifrost-deployment.sh
utils/test/reporting/functest/index.html
utils/test/reporting/yardstick/index.html
utils/test/scripts/backup-db.sh

index 9493cd8..bffa91d 100644 (file)
     triggers:
         - timed: '0 3 * * 5'
 #----------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against brahmaputra branch
+# Enea Armband CI Baremetal Triggers running against colorado branch
 #----------------------------------------------------------------------
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-ha-baremetal-colorado-trigger'
     triggers:
         - timed: ''
 #--------------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against brahmaputra branch
+# Enea Armband CI Virtual Triggers running against colorado branch
 #--------------------------------------------------------------------
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-ha-virtual-colorado-trigger'
     triggers:
         - timed: ''
 #---------------------------------------------------------------
-# Enea Armband POD 2 Triggers running against brahmaputra branch
+# Enea Armband POD 2 Triggers running against colorado branch
 #---------------------------------------------------------------
 - trigger:
     name: 'armband-fuel-os-odl_l2-nofeature-ha-arm-pod2-colorado-trigger'
index 901f845..d762650 100755 (executable)
@@ -50,6 +50,13 @@ if [[ $LAB_CONFIG_URL =~ ^(git|ssh):// ]]; then
     echo "cloning $LAB_CONFIG_URL"
     git clone --quiet --branch ${GIT_BRANCH##origin/} $LAB_CONFIG_URL lab-config
     LAB_CONFIG_URL=file://${WORKSPACE}/lab-config
+
+    # Source local_env if present, which contains POD-specific config
+    local_env="$LAB_CONFIG_URL/labs/$LAB_NAME/$POD_NAME/fuel/config/local_env"
+    if [ -e $local_env ]; then
+        echo "-- Sourcing local environment file"
+        source $local_env
+    fi
 fi
 
 # releng wants us to use nothing else but opnfv.iso for now. We comply.
index ff2c6e8..056b2cc 100644 (file)
 
     publishers:
         - email:
-            recipients: peter.barabas@ericsson.com
+            recipients: peter.barabas@ericsson.com fzhadaev@mirantis.com
 
 - job-template:
     name: 'fuel-deploy-{pod}-daily-{stream}'
 
     publishers:
         - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com peter.barabas@ericsson.com
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com peter.barabas@ericsson.com fzhadaev@mirantis.com
 
 ########################
 # parameter macros
index cf89383..588ab0c 100644 (file)
@@ -79,7 +79,7 @@
 
     publishers:
         - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com
 
 - job-template:
     name: 'fuel-merge-build-{stream}'
 
     publishers:
         - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com fzhadaev@mirantis.com
 
 - job-template:
     name: 'fuel-deploy-generic-daily-{stream}'
index c31eae7..3925450 100644 (file)
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-suite'
-        - 'functest-exit'
 
 - builder:
     name: functest-daily
index 327ea97..422626e 100755 (executable)
@@ -11,6 +11,7 @@ fi
 
 case "$JOB_TYPE" in
     verify)
+        OPNFV_ARTIFACT_VERSION="gerrit-$GERRIT_CHANGE_NUMBER"
         GS_UPLOAD_LOCATION="gs://artifacts.opnfv.org/$PROJECT/review/$GERRIT_CHANGE_NUMBER"
         echo "Removing outdated artifacts produced for the previous patch for the change $GERRIT_CHANGE_NUMBER"
         gsutil ls $GS_UPLOAD_LOCATION > /dev/null 2>&1 && gsutil rm -r $GS_UPLOAD_LOCATION
@@ -26,11 +27,31 @@ case "$JOB_TYPE" in
         exit 1
 esac
 
+# save information regarding artifacts into file
+(
+    echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
+    echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
+    echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
+    echo "OPNFV_ARTIFACT_URL=$GS_UPLOAD_LOCATION"
+    echo "OPNFV_BUILD_URL=$BUILD_URL"
+) > $WORKSPACE/opnfv.properties
+
+# upload artifacts
 gsutil cp -r $WORKSPACE/build_output/* $GS_UPLOAD_LOCATION > $WORKSPACE/gsutil.log 2>&1
 gsutil -m setmeta -r \
     -h "Cache-Control:private, max-age=0, no-transform" \
     $GS_UPLOAD_LOCATION > /dev/null 2>&1
 
+# upload metadata file for the artifacts built by daily job
+if [[ "$JOB_TYPE" == "daily" ]]; then
+    gsutil cp $WORKSPACE/opnfv.properties $GS_UPLOAD_LOCATION/opnfv.properties > $WORKSPACE/gsutil.log 2>&1
+    gsutil cp $WORKSPACE/opnfv.properties $GS_URL/latest.properties > $WORKSPACE/gsutil.log 2>&1
+    gsutil -m setmeta -r \
+        -h "Cache-Control:private, max-age=0, no-transform" \
+        $GS_UPLOAD_LOCATION/opnfv-${OPNFV_ARTIFACT_VERSION}.properties \
+        $GS_URL/latest.properties > /dev/null 2>&1
+fi
+
 gsutil ls $GS_UPLOAD_LOCATION > /dev/null 2>&1
 if [[ $? -ne 0 ]]; then
     echo "Problem while uploading artifacts!"
index 608ce43..0c8435d 100644 (file)
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: LAB_CONFIG_URL
+            default: ssh://git@git.enea.com/pharos/lab-config
+            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'joid-baremetal-defaults'
     parameters:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
+        - string:
+            name: LAB_CONFIG_URL
+            default: ssh://git@git.enea.com/pharos/lab-config
+            description: 'Base URI to the configuration directory'
 - parameter:
     name: 'joid-virtual-defaults'
     parameters:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: DEFAULT_BRIDGE
-            default: 'admin6_br0,public6_br0'
-            desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.'
-        - string:
-            name: DEPLOY_TIMEOUT
-            default: '360'
-            description: 'Deployment timeout in minutes'
         - string:
             name: LAB_CONFIG_URL
             default: ssh://git@git.enea.com/pharos/lab-config
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
-        - string:
-            name: DEFAULT_BRIDGE
-            default: 'admin_br0,public_br0'
-            desciption: 'The bridge to use for Fuel PXE booting. It can be a comma sparated list of bridges, in which case the first is the PXE boot bridge, and all subsequent interfaces that will be added to the VM. If left empty, most deploy scripts will default to pxebr.'
-        - string:
-            name: DEPLOY_TIMEOUT
-            default: '360'
-            description: 'Deployment timeout in minutes'
         - string:
             name: LAB_CONFIG_URL
             default: ssh://git@git.enea.com/pharos/lab-config
index 8328aec..eb4ee52 100644 (file)
@@ -47,6 +47,7 @@
                 - 'origin/$GERRIT_BRANCH'
             skip-tag: true
             choosing-strategy: '{choosing-strategy}'
+            timeout: 15
 
 - wrapper:
     name: build-timeout
index 66affe9..d796f35 100755 (executable)
@@ -71,17 +71,17 @@ set -x -o nounset
 cd $BIFROST_HOME/playbooks
 
 # Syntax check of dynamic inventory test path
-${ANSIBLE} -vvvv \
-       -i inventory/localhost \
-       test-bifrost-create-vm.yaml \
-       --syntax-check \
-       --list-tasks
-${ANSIBLE} -vvvv \
-       -i inventory/localhost \
-       ${TEST_PLAYBOOK} \
-       --syntax-check \
-       --list-tasks \
-       -e testing_user=${TESTING_USER}
+for task in syntax-check list-tasks; do
+    ${ANSIBLE} -vvvv \
+           -i inventory/localhost \
+           test-bifrost-create-vm.yaml \
+           --${task}
+    ${ANSIBLE} -vvvv \
+           -i inventory/localhost \
+           ${TEST_PLAYBOOK} \
+           --${task} \
+           -e testing_user=${TESTING_USER}
+done
 
 # Create the test VMS
 ${ANSIBLE} -vvvv \
index af40335..bb1bce2 100644 (file)
         <h3 class="text-muted">Functest reporting page</h3>
         <nav>
           <ul class="nav nav-justified">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="./index-status-apex.html">Status</a></li>
-            <li><a href="./index-tempest-apex.html">Tempest</a></li>
-            <li><a href="./index-vims-apex.html">vIMS</a></li>
+            <li class="active"><a href="http://testresults.opnfv.org/reporting/index.html">Home</a></li>
+            <li><a href="index-status-apex.html">Apex</a></li>
+            <li><a href="index-status-compass.html">Compass</a></li>
+            <li><a href="index-status-fuel.html">Fuel</a></li>
+            <li><a href="index-status-joid.html">Joid</a></li>
           </ul>
         </nav>
       </div>
index ec64bc8..488f142 100644 (file)
         <h3 class="text-muted">Yardstick reporting page</h3>
         <nav>
           <ul class="nav nav-justified">
-            <li class="active"><a href="#">Home</a></li>
-            <li><a href="./index-status-apex.html">Status</a></li>
+            <li class="active"><a href="http://testresults.opnfv.org/reporting/index.html">Home</a></li>
+            <li><a href="index-status-apex.html">Apex</a></li>
+            <li><a href="index-status-compass.html">Compass</a></li>
+            <li><a href="index-status-fuel.html">Fuel</a></li>
+            <li><a href="index-status-joid.html">Joid</a></li>
           </ul>
         </nav>
       </div>
@@ -45,4 +48,4 @@
         </div>
     </div>
     <div class="col-md-1"></div>
-</div>
\ No newline at end of file
+</div>
index aa36aa3..35c3fbe 100644 (file)
@@ -18,16 +18,16 @@ echo "Create Directory for backup"
 mkdir -p $TARGET_DIR
 
 echo "Export results"
-mongoexport -db test_results_collection -c test_results --out $TARGET_DIR/results.json
+mongoexport --db test_results_collection -c results --out $TARGET_DIR/backup-results.json
 echo "Export test cases"
-mongoexport --db test_results_collection -c test_cases --out $TARGET_DIR/backup-cases.json
+mongoexport --db test_results_collection -c testcases --out $TARGET_DIR/backup-cases.json
 echo "Export projects"
-mongoexport --db test_results_collection -c test_projects --out $TARGET_DIR/backup-projects.json
+mongoexport --db test_results_collection -c projects --out $TARGET_DIR/backup-projects.json
 echo "Export pods"
-mongoexport --db test_results_collection -c pod --out $TARGET_DIR/backup-pod.json
+mongoexport --db test_results_collection -c pods --out $TARGET_DIR/backup-pod.json
 
 echo "Create tar.gz"
-tar -cvzf $TEST_RESULT_DB_BACKUP $TARGET_DIR
+#tar -cvzf $TEST_RESULT_DB_BACKUP $TARGET_DIR
 
 echo "Delete temp directory"
-rm -Rf $TARGET_DIR
+#rm -Rf $TARGET_DIR