Merge "Added VNF_Catalogue Server"

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 790d2a3..b68225f 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -62,7 +62,7 @@ fi
 if [ -z "$DEPLOY_SCENARIO" ]; then
   echo "Deploy scenario not set!"
   exit 1
-elif [ "$DEPLOY_SCENARIO" == *gate* ]; then
+elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then
   echo "Detecting Gating scenario..."
   if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then
     echo "ERROR: Gate job triggered without comment!"

diff --git a/jjb/apex/apex-upload-artifact.sh b/jjb/apex/apex-upload-artifact.sh
index 89fd5ed..ef8ad53 100755 (executable)
--- a/jjb/apex/apex-upload-artifact.sh
+++ b/jjb/apex/apex-upload-artifact.sh
@@ -81,7 +81,7 @@ uploadsnap () {
   echo "Upload complete for Snapshot"
 }
 
-if grep csit $WORKSPACE; then
+if echo $WORKSPACE | grep csit > /dev/null; then
   uploadsnap
 elif gpg2 --list-keys | grep "opnfv-helpdesk@rt.linuxfoundation.org"; then
   echo "Signing Key avaliable"

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index b749ea6..7258e89 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -41,8 +41,8 @@
 #--------------------------------
 #        master
 #--------------------------------
-        - huawei-pod5:
-            slave-label: '{pod}'
+        - baremetal-centos:
+            slave-label: 'intel-pod8'
             os-version: 'centos7'
             <<: *master
 
@@ -243,35 +243,35 @@
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: '0 19 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: '0 23 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-onos-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: '0 7 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-ocl-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: '0 11 * * *'
 - trigger:
-    name: 'compass-os-onos-sfc-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-onos-sfc-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-moon-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-odl_l2-moon-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-nosdn-kvm-ha-huawei-pod5-master-trigger'
+    name: 'compass-os-nosdn-kvm-ha-baremetal-centos-master-trigger'
     triggers:
         - timed: ''
 

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 1c3e843..e2a334d 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -126,8 +126,8 @@
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
-        - huawei-pod5:
-            slave-label: '{pod}'
+        - baremetal-centos:
+            slave-label: 'intel-pod8'
             SUT: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 7174045..a2b5aa1 100644 (file)
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -133,8 +133,8 @@
             slave-label: '{pod}'
             installer: joid
             <<: *master
-        - huawei-pod5:
-            slave-label: '{pod}'
+        - baremetal-centos:
+            slave-label: 'intel-pod8'
             installer: compass
             <<: *master
         - nokia-pod1:

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 243e0a4..0aeab4c 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -475,15 +475,15 @@
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: 'Git URL to use on this Jenkins Slave'
 - parameter:
-    name: 'huawei-pod5-defaults'
+    name: 'intel-pod8-defaults'
     parameters:
         - node:
             name: SLAVE_NAME
             description: 'Slave name on Jenkins'
             allowed-slaves:
-                - huawei-pod5
+                - intel-pod8
             default-slaves:
-                - huawei-pod5
+                - intel-pod8
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT

diff --git a/jjb/infra/bifrost-verify.sh b/jjb/infra/bifrost-verify.sh
index 94c7dac..4115ffc 100755 (executable)
--- a/jjb/infra/bifrost-verify.sh
+++ b/jjb/infra/bifrost-verify.sh
@@ -24,8 +24,9 @@ function upload_logs() {
     # before we upload the new data.
     gsutil -q rm ${BIFROST_GS_URL}/index.html || true
 
+    echo "Uploading collected bifrost build logs to ${BIFROST_LOG_URL}"
+
     if [[ -d ${WORKSPACE}/logs ]]; then
-        echo "Uploading collected bifrost logs to ${BIFROST_LOG_URL}"
         pushd ${WORKSPACE}/logs &> /dev/null
         for x in *.log; do
             echo "Compressing and uploading $x"
@@ -34,7 +35,7 @@ function upload_logs() {
         popd &> /dev/null
     fi
 
-    echo "Generating the landing page"
+    echo "Generating the ${BIFROST_LOG_URL}/index.html landing page"
     cat > ${WORKSPACE}/index.html <<EOF
 <html>
 <h1>Build results for <a href=https://$GERRIT_NAME/#/c/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER>$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER</a></h1>
@@ -58,7 +59,7 @@ EOF
 
     # Finally, download and upload the entire build log so we can retain
     # as much build information as possible
-    echo "Uploading console output"
+    echo "Uploading the final console output"
     curl -s -L ${BIFROST_CONSOLE_LOG} > ${WORKSPACE}/build_log.txt
     gsutil -q cp -Z ${WORKSPACE}/build_log.txt ${BIFROST_GS_URL}/build_log.txt
     rm ${WORKSPACE}/build_log.txt

diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 997fd8a..98f7ab9 100644 (file)
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -13,6 +13,7 @@
         branch: '{stream}'
         gs-pathname: ''
         docker-tag: latest
+
 #--------------------------------
 # JOB VARIABLES
 #--------------------------------
@@ -30,6 +31,10 @@
         - validate:
             auto-builder-name: qtip-validate-setup
             auto-trigger-name: qtip-validate-trigger
+        - experimental:
+            auto-builder-name: qtip-validate-setup
+            auto-trigger-name: experimental
+
 #--------------------------------
 # JOB LIST
 #--------------------------------

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 2c3dda9..604eaed 100644 (file)
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -197,8 +197,8 @@
             installer: compass
             auto-trigger-name: 'yardstick-daily-huawei-pod4-trigger'
             <<: *master
-        - huawei-pod5:
-            slave-label: '{pod}'
+        - baremetal-centos:
+            slave-label: 'intel-pod8'
             installer: compass
             auto-trigger-name: 'daily-trigger-disabled'
             <<: *master
@@ -381,15 +381,6 @@
             name: YARDSTICK_DB_BACKEND
             default: '-i 104.197.68.199:8086'
             description: 'Arguments to use in order to choose the backend DB'
-
-- parameter:
-    name: 'yardstick-params-huawei-pod5'
-    parameters:
-        - string:
-            name: YARDSTICK_DB_BACKEND
-            default: '-i 104.197.68.199:8086'
-            description: 'Arguments to use in order to choose the backend DB'
-
 - parameter:
     name: 'yardstick-params-zte-pod1'
     parameters: