Merge "add filter based on begin&end time of start_date"

diff --git a/UPSTREAM b/UPSTREAM
new file mode 100644 (file)
index 0000000..65e44f5
--- /dev/null
+++ b/UPSTREAM
@@ -0,0 +1,448 @@
+# Upstream contributions, bitergia will crawl this and extract the relevant information
+# system is one of Gerrit, Bugzilla, Launchpad (insert more)
+#
+# All the contributions listed in this file are merged commits. Contributions under
+# review, in progress and abandoned are not included.
+# The latest contribution included in this file is 453130 and it is dated 2017-05-23.
+# Contributions from Yolanda Robla Mota have not been included yet.
+# The gerrit query used to list contributions is
+#   status:merged AND (owner: "Markos Chandras" OR owner: "Fatih Degirmenci")
+---
+-
+  url: https://review.openstack.org/#/c/453130/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/466422/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/466421/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/466249/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/465927/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/465686/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/465685/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/464759/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/464180/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/464629/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/463359/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/463313/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/463301/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/463300/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/462488/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/450970/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/463299/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/462863/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/461754/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/462859/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/462443/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/461755/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/461018/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/461017/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/461050/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/458616/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/460617/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/458797/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/453128/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459984/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/460071/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459779/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459775/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459332/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459331/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459330/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459715/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459702/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459684/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459599/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/459461/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/458801/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/457709/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/458246/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/458420/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/458419/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/450634/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/457695/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/455290/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/455461/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/448800/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/453609/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/453798/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/453577/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/453574/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/449183/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/452079/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/452160/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/450384/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/450210/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/451848/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/451426/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/450239/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/450095/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/448625/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/447444/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/447435/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/441041/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/444197/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/439938/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/444033/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/442224/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/428345/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/440614/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/439946/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/441042/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/439940/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/433517/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/435433/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/437010/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/436948/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/436000/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/436066/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/436085/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/435994/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/434328/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/433532/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/427682/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/428704/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/430864/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/428716/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/427744/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/426844/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/424853/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/410639/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/407970/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/387441/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/398317/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/401991/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/400150/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/404315/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/389171/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/401164/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/400712/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/392002/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/388242/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/392003/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/392986/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/392004/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/389079/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/388158/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/388840/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/388780/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/388847/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/388748/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/381576/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/381575/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/378532/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/386002/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/381574/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/381541/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/376303/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/379835/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/376534/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/375350/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/371602/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/370258/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/370584/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/363458/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/366835/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/363896/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/353165/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/361652/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/358477/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/359922/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/357268/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/357718/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/356964/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/355485/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/355431/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/355668/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/202056/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/202180/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/192397/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/192720/
+  system: Gerrit
+-
+  url: https://review.openstack.org/#/c/163149/
+  system: Gerrit

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 50502d7..5974383 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -294,6 +294,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    GERRIT_EVENT_COMMENT_TEXT=$GERRIT_EVENT_COMMENT_TEXT
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 84a899f..41a4ee7 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -294,6 +294,7 @@
                     GERRIT_REFSPEC=$GERRIT_REFSPEC
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                    GERRIT_EVENT_COMMENT_TEXT=$GERRIT_EVENT_COMMENT_TEXT
                   node-parameters: true
                   kill-phase-on: FAILURE
                   abort-all-job: true

diff --git a/jjb/compass4nfv/compass-build.sh b/jjb/compass4nfv/compass-build.sh
index ea98c05..673a9f1 100644 (file)
--- a/jjb/compass4nfv/compass-build.sh
+++ b/jjb/compass4nfv/compass-build.sh
@@ -25,7 +25,7 @@ fi
 
 cd $WORKSPACE/
 
-if [[ "$BRANCH" == 'danube' ]]; then
+if [[ "$BRANCH" == 'stable/danube' ]]; then
     ./build.sh  --iso-dir $BUILD_DIRECTORY/ --iso-name compass.iso -c $CACHE_DIRECTORY
     OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $BUILD_DIRECTORY/compass.iso | cut -d' ' -f1)
     OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7d67c37..3ba69fa 100644 (file)
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -109,6 +109,7 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - fix-workspace-permissions
 
     parameters:
         - project-parameter:
@@ -206,6 +207,7 @@
         - timeout:
             timeout: 120
             abort: true
+        - fix-workspace-permissions
 
     parameters:
         - project-parameter:
@@ -220,11 +222,6 @@
     scm:
         - git-scm
 
-    wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-
     builders:
         - description-setter:
             description: "POD: $NODE_NAME"

diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 111ac66..2668ccd 100644 (file)
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -23,7 +23,7 @@ fi
 echo 1 > /proc/sys/vm/drop_caches
 
 export CONFDIR=$WORKSPACE/deploy/conf
-if [[ "$BRANCH" = 'danube' ]]; then
+if [[ "$BRANCH" = 'stable/danube' ]]; then
     export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
 else
     export ISO_URL=file://$BUILD_DIRECTORY/compass.tar.gz

diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index c321655..966dae5 100644 (file)
--- a/jjb/compass4nfv/compass-dovetail-jobs.yml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yml
@@ -55,6 +55,7 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - fix-workspace-permissions
 
     triggers:
         - '{auto-trigger-name}'
@@ -137,6 +138,7 @@
         - timeout:
             timeout: 120
             abort: true
+        - fix-workspace-permissions
 
     parameters:
         - project-parameter:
@@ -151,11 +153,6 @@
     scm:
         - git-scm
 
-    wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-
     builders:
         - description-setter:
             description: "POD: $NODE_NAME"

diff --git a/jjb/compass4nfv/compass-download-artifact.sh b/jjb/compass4nfv/compass-download-artifact.sh
index c09a70c..f891564 100644 (file)
--- a/jjb/compass4nfv/compass-download-artifact.sh
+++ b/jjb/compass4nfv/compass-download-artifact.sh
@@ -18,7 +18,7 @@ curl -s -o $BUILD_DIRECTORY/latest.properties http://$GS_URL/latest.properties
 # source the file so we get OPNFV vars
 source $BUILD_DIRECTORY/latest.properties
 
-if [[ "$BRANCH" == 'danube' ]]; then
+if [[ "$BRANCH" == 'stable/danube' ]]; then
     # download the file
     curl -s -o $BUILD_DIRECTORY/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1
     # list the file

diff --git a/jjb/compass4nfv/compass-upload-artifact.sh b/jjb/compass4nfv/compass-upload-artifact.sh
index c6e179d..87a9334 100644 (file)
--- a/jjb/compass4nfv/compass-upload-artifact.sh
+++ b/jjb/compass4nfv/compass-upload-artifact.sh
@@ -7,7 +7,7 @@ echo "Uploading the $INSTALLER_TYPE artifact. This could take some time..."
 echo "--------------------------------------------------------"
 echo
 
-if [[ "$BRANCH" == 'danube' ]]; then
+if [[ "$BRANCH" == 'stable/danube' ]]; then
     FILETYPE='iso'
 else
     FILETYPE='tar.gz'

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index 60ea3f6..4b05e22 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -71,14 +71,15 @@
                 - 'compass-os-.*?-virtual-daily-.*?'
             block-level: 'NODE'
 
-    scm:
-        - git-scm-gerrit
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
             timeout: 120
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -193,14 +194,15 @@
                 - 'compass-os-.*?-virtual-daily-.*?'
             block-level: 'NODE'
 
-    scm:
-        - git-scm-gerrit
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
             timeout: 120
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -292,14 +294,15 @@
                 - 'functest-compass-virtual.*'
             block-level: 'NODE'
 
-    scm:
-        - git-scm-gerrit
-
     wrappers:
         - ssh-agent-wrapper
         - timeout:
             timeout: 120
             fail: true
+        - fix-workspace-permissions
+
+    scm:
+        - git-scm-gerrit
 
     builders:
         - description-setter:

diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml
index cd40050..bdb12e3 100644 (file)
--- a/jjb/storperf/storperf.yml
+++ b/jjb/storperf/storperf.yml
@@ -158,6 +158,42 @@
             name: DOCKER_TAG
             default: '{docker-tag}'
             description: 'Tag to pull docker image'
+        - choice:
+            name: DISK_TYPE
+            choices:
+                - 'SSD'
+                - 'HDD'
+            description: 'The type of hard disk that Cinder uses'
+        - string:
+            name: AGENT_COUNT
+            description: 'The number of slave agents to start. Defaults to the cinder node count'
+        - string:
+            name: VOLUME_SIZE
+            description: 'Size of Cinder volume (in GB)'
+        - string:
+            name: WORKLOADS
+            default: 'ws,wr,rs,rr,rw'
+            description: 'Workloads to run'
+        - string:
+            name: BLOCK_SIZES
+            default: 2048,8192,16384
+            description: 'Block sizes for VM I/O operations'
+        - string:
+            name: QUEUE_DEPTHS
+            default: 1,2,4
+            description: 'Number of simultaneous I/O operations to keep active'
+        - string:
+            name: STEADY_STATE_SAMPLES
+            default: '10'
+            description: 'Number of samples to use (1 per minute) to measure steady state'
+        - string:
+            name: DEADLINE
+            description: 'Maximum run time in minutes if steady state cannot be found. Defaults to 3 times steady state samples'
+        - choice:
+            name: TEST_CASE
+            choices:
+                - 'snia_steady_state'
+            description: 'The test case to run'
 
     scm:
         - git-scm

diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
similarity index 100%
rename from jjb/yardstick/yardstick-ci-jobs.yml
rename to jjb/yardstick/yardstick-daily-jobs.yml