Merge "Change scheduling of csit-vpp-verify-perf-master-nightly-all"

diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml
index 4b4fb9b..ad622be 100644 (file)
--- a/jjb/csit/csit.yaml
+++ b/jjb/csit/csit.yaml
@@ -785,7 +785,7 @@
     scm:
         - gerrit-trigger-scm:
             credentials-id: 'jenkins-gerrit-credentials'
-            refspec: ''
+            refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'default'
 
     wrappers:

diff --git a/jjb/csit/include-raw-csit-report.sh b/jjb/csit/include-raw-csit-report.sh
index 059c09d..40144f2 100644 (file)
--- a/jjb/csit/include-raw-csit-report.sh
+++ b/jjb/csit/include-raw-csit-report.sh
@@ -4,13 +4,13 @@ set -xe -o pipefail
 
 [ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site"
 [ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/csit
-[ "$REPORT_DIR" ] || REPORT_DIR=resources/tools/report_gen
+[ "$DOC_DIR" ] || DOC_DIR=resources/tools/report_gen
 [ "$BUILD_DIR" ] || BUILD_DIR=${DOC_DIR}/_build
 [ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site
 [ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources/report
 [ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn"
 
-cd ${REPORT_DIR}
+cd ${DOC_DIR}
 chmod +x ./run_report.sh
 ./run_report.sh ${GERRIT_BRANCH}
 

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index f6ed415..ba3ffe8 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -75,6 +75,10 @@ rh_systems() {
             alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
         ;;
     esac
+
+    # Needed to parse OpenStack commands used by infra
+    # stack commands to initialize Heat template based systems.
+    yum install -y jq
 }
 
 ubuntu_systems() {
@@ -121,6 +125,10 @@ EOF
     update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
     update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/bin/javac
 
+    # Needed to parse OpenStack commands used by infra
+    # stack commands to initialize Heat template based systems.
+    apt-get install -qq jq > /dev/null
+
     # disable unattended upgrades & daily updates
     echo '---> Disabling automatic daily upgrades'
     sed -ine 's/"1"/"0"/g' /etc/apt/apt.conf.d/10periodic