Merge "add doctor-functest verify job"

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index 4fd7b00..72fa6f6 100755 (executable)
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -54,8 +54,8 @@ else
       fi
       # source the file so we get OPNFV vars
       source opnfv.properties
-      RPM_INSTALL_PATH=$(echo $OPNFV_RPM_URL | sed 's/'"$(basename $OPNFV_RPM_URL)"'//')
-      RPM_LIST=$RPM_INSTALL_PATH/$(basename $OPNFV_RPM_URL)
+      RPM_INSTALL_PATH=$(echo "http://"$OPNFV_RPM_URL | sed 's/\/'"$(basename $OPNFV_RPM_URL)"'//')
+      RPM_LIST=${RPM_INSTALL_PATH}/$(basename $OPNFV_RPM_URL)
     fi
 fi
 

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 8a5a82f..89965d7 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -334,6 +334,7 @@
               OPNFV_CLEAN=yes
             git-revision: false
             block: true
+            same-node: true
         - trigger-builds:
           - project: 'cperf-apex-intel-pod2-daily-{stream}'
             predefined-parameters:

diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index f100a46..2598732 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -90,7 +90,7 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
             option: 'project'
         - build-blocker:
@@ -152,12 +152,12 @@
 - job-template:
     name: '{installer}-deploy-{pod}-daily-{stream}'
 
-    concurrent: false
+    concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
             option: 'project'
         - build-blocker:

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 136aac8..2104d90 100755 (executable)
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -143,14 +143,17 @@ expect {
 expect "# "
 send "/usr/bin/ssh -l root $::env(CONTROLLER_NODE_IP)\r"
 expect "# "
+send "PS1=\"tacker_poc> \"\r"
+expect -re {tacker_poc> $}
 send "sudo apt-get install -y git\r"
-expect "# "
+expect -re {tacker_poc> $}
+sleep 10
 send "/bin/mkdir -p /root/sfc-poc && cd /root/sfc-poc\r"
-expect "# "
+expect -re {tacker_poc> $}
 send "git clone https://gerrit.opnfv.org/gerrit/fuel && cd fuel\r"
-expect "# "
+expect -re {tacker_poc> $}
 send "/bin/bash /root/sfc-poc/fuel/prototypes/sfc_tacker/poc.tacker-up.sh\r"
-expect "# "
+expect -re {tacker_poc> $}
 send "exit\r"
 expect "Connection to $::env(CONTROLLER_NODE_IP) closed. "
 send "exit\r"

diff --git a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh
index 1f99f17..c8bdb9c 100755 (executable)
--- a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh
+++ b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh
@@ -16,6 +16,12 @@ case "$JOB_TYPE" in
         echo "Downloading artifacts for the change $GERRIT_CHANGE_NUMBER. This could take some time..."
         GS_UPLOAD_LOCATION="gs://artifacts.opnfv.org/$PROJECT/review/$GERRIT_CHANGE_NUMBER"
         ;;
+    daily)
+        gsutil cp gs://$GS_URL/latest.properties $WORKSPACE/latest.properties
+        source $WORKSPACE/latest.properties
+        GS_UPLOAD_LOCATION=$OPNFV_ARTIFACT_URL
+        echo "Downloading artifacts from $GS_UPLOAD_LOCATION for daily run. This could take some time..."
+        ;;
     *)
         echo "Artifact download is not enabled for $JOB_TYPE jobs"
         exit 1

diff --git a/jjb/kvmfornfv/kvmfornfv-test.sh b/jjb/kvmfornfv/kvmfornfv-test.sh
index 868de13..06377ac 100755 (executable)
--- a/jjb/kvmfornfv/kvmfornfv-test.sh
+++ b/jjb/kvmfornfv/kvmfornfv-test.sh
@@ -3,8 +3,24 @@
 ##This script includes executing cyclictest scripts.
 ##########################################################
 #The latest build packages are stored in build_output
+
 ls -al $WORKSPACE/build_output
 
-#start the test
-cd $WORKSPACE
-./ci/test_kvmfornfv.sh
+if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
+    JOB_TYPE=${BASH_REMATCH[0]}
+else
+    echo "Unable to determine job type!"
+    exit 1
+fi
+
+# do stuff differently based on the job type
+case "$JOB_TYPE" in
+    verify|daily)
+        #start the test
+        cd $WORKSPACE
+        ./ci/test_kvmfornfv.sh $JOB_TYPE
+        ;;
+    *)
+        echo "Test is not enabled for $JOB_TYPE jobs"
+        exit 1
+esac

diff --git a/jjb/kvmfornfv/kvmfornfv.yml b/jjb/kvmfornfv/kvmfornfv.yml
index 4bb0a15..b6a55fe 100644 (file)
--- a/jjb/kvmfornfv/kvmfornfv.yml
+++ b/jjb/kvmfornfv/kvmfornfv.yml
@@ -28,6 +28,7 @@
         - 'kvmfornfv-verify-{phase}-{stream}'
         - 'kvmfornfv-merge-{stream}'
         - 'kvmfornfv-daily-{stream}'
+        - 'kvmfornfv-daily-{phase}-{stream}'
 #####################################
 # job templates
 #####################################
@@ -201,10 +202,63 @@
          - timed: '@midnight'
 
     builders:
-        - shell:
-            !include-raw-escape: ./kvmfornfv-build.sh
-        - shell:
-            !include-raw-escape: ./kvmfornfv-upload-artifact.sh
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - multijob:
+            name: build
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-daily-build-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+        - multijob:
+            name: test
+            condition: SUCCESSFUL
+            projects:
+                - name: 'kvmfornfv-daily-test-{stream}'
+                  current-parameters: false
+                  node-parameters: false
+                  git-revision: true
+                  kill-phase-on: FAILURE
+                  abort-all-job: true
+
+
+- job-template:
+    name: 'kvmfornfv-daily-{phase}-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    concurrent: false
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'default'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+        - timeout:
+            timeout: 360
+            fail: true
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - '{slave-label}-defaults'
+        - 'kvmfornfv-defaults':
+            gs-pathname: '{gs-pathname}'
+
+    builders:
+        - description-setter:
+            description: "Built on $NODE_NAME"
+        - '{project}-daily-{phase}-macro'
 #####################################
 # builder macros
 #####################################
@@ -222,6 +276,21 @@
             !include-raw: ./kvmfornfv-download-artifact.sh
         - shell:
             !include-raw: ./kvmfornfv-test.sh
+- builder:
+    name: 'kvmfornfv-daily-build-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-build.sh
+        - shell:
+            !include-raw: ./kvmfornfv-upload-artifact.sh
+- builder:
+    name: 'kvmfornfv-daily-test-macro'
+    builders:
+        - shell:
+            !include-raw: ./kvmfornfv-download-artifact.sh
+        - shell:
+            !include-raw: ./kvmfornfv-test.sh
+
 #####################################
 # parameter macros
 #####################################

diff --git a/utils/test/reporting/yardstick/reportingConf.py b/utils/test/reporting/yardstick/reportingConf.py
index af95cc0..9e34034 100644 (file)
--- a/utils/test/reporting/yardstick/reportingConf.py
+++ b/utils/test/reporting/yardstick/reportingConf.py
@@ -11,7 +11,7 @@
 # ****************************************************
 installers = ["apex", "compass", "fuel", "joid"]
 
-versions = ["master"]
+versions = ["master", "stable/colorado"]
 
 # get data in the past 7 days
 PERIOD = 7