Merge "Add ovs integration tests for netvirt"

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index 46fe80361436774e19da3c14f4bc01fb1c2fb6d7..c76676d0a80afea951fc12ecfa95368deefd981c 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -16,7 +16,7 @@
             jre: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
-            jre: 'openjdk7'
+            jre: 'openjdk8'
 
     install:
         - only:

diff --git a/jjb/spectrometer/spectrometer-python.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
similarity index 74%
rename from jjb/spectrometer/spectrometer-python.yaml
rename to jjb/spectrometer/spectrometer-jobs.yaml
index ac9c06558a4922bb76df1f94b3170ae6c11b8f50..b5b1d8697dc0af746a8236898533ecd4a87082d9 100644 (file)
--- a/jjb/spectrometer/spectrometer-python.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -1,16 +1,18 @@
 - project:
-    name: spectrometer-python
+    name: spectrometer
     jobs:
-        - 'spectrometer-verify-python-{stream}'
+        - 'spectrometer-merge-{stream}'
+        - '{name}-verify-python-{stream}'
 
     stream:
         - master:
             branch: 'master'
 
     project: 'spectrometer'
+    toxdir: server
 
 - job-template:
-    name: 'spectrometer-verify-python-{stream}'
+    name: 'spectrometer-merge-{stream}'
 
     project-type: freestyle
     node: dynamic_verify
@@ -21,6 +23,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -44,9 +48,7 @@
                     exclude-no-code-change: 'false'
                 - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'spectrometer'
@@ -56,12 +58,7 @@
 
     builders:
         - shell: |
-            virtualenv $WORKSPACE/venv-tox
-            source $WORKSPACE/venv-tox/bin/activate
-            pip install tox argparse
-            tox --version
-            cd server
-            tox
+            wget --post-data=test -qO- https://readthedocs.org/build/opendaylight-spectrometer &> /dev/null
 
     publishers:
         - email-notification:

diff --git a/scripts/odlrelease b/scripts/odlrelease
index 91e68e7c8db6d2957a64f3a0203b8ad96de75122..61526084ecf425fb74dee124a9f774130a04e240 100755 (executable)
--- a/scripts/odlrelease
+++ b/scripts/odlrelease
@@ -37,7 +37,7 @@ function sign {
     echo "Fetching artifacts from $URL"
     # Fetch Artifacts
     wget --recursive --execute robots=off --no-parent --quiet \
-        --no-host-directories --cut-dirs=2 \
+        --no-host-directories --cut-dirs=3 \
         $URL
 
     # Remove files that don't need signing

diff --git a/scripts/odlsign-bulk b/scripts/odlsign-bulk
new file mode 100755 (executable)
index 0000000..6a9acf8
--- /dev/null
+++ b/scripts/odlsign-bulk
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+##############################################################################
+# Copyright (c) 2016 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+function print_usage {
+    echo "Usage: $0 <staging-repo>"
+    echo ""
+    echo "    <staging-repo>   : The Nexus staging repo ID to sign."
+}
+
+if [ -z "$1" ]; then
+    print_usage
+    exit 1
+fi
+
+SIGNREPO=$1
+SIGNATURES_DIR="gpg-signatures"
+TMPFILE=/tmp/project-list.txt
+
+wget -q https://nexus.opendaylight.org/content/repositories/$SIGNREPO/org/opendaylight/ -O $TMPFILE
+PROJECTS=`grep '/</a>' $TMPFILE | sed -e 's#/</a>.*##' -e 's#.*/">##'`
+echo "Projects detected: $PROJECTS"
+
+#
+# Prepare staging repo to upload signatures to
+#
+
+if [ -d "$SIGNATURES_DIR" ]; then
+    echo "$SIGNATURES_DIR directory exists. Clearing..."
+    rm -rf $SIGNATURES_DIR
+fi
+mkdir $SIGNATURES_DIR
+
+mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:deploy-staged-repository \
+    -DskipStagingRepositoryClose=true \
+    -DrepositoryDirectory="$SIGNATURES_DIR" \
+    -DnexusUrl=https://nexus.opendaylight.org/ \
+    -DstagingProfileId="425e43800fea70" \
+    -DserverId="opendaylight.staging" | tee /tmp/deploy-staged-repository.log
+
+STAGED_REPO_ID=`grep 'Created staging repository with ID' /tmp/deploy-staged-repository.log | sed -e 's/.*ID "//' -e 's/".*//'`
+echo "Staged Repo: $STAGED_REPO"
+
+#
+# Finally retrieve and sign artifacts.
+#
+
+for i in $PROJECTS
+do
+    echo "Signing $i"
+    ./odlrelease sign http://nexus.opendaylight.org/content/repositories/$SIGNREPO/org/opendaylight/$i/
+    mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.7:deploy-staged-repository \
+        -DskipStagingRepositoryClose=true \
+        -DstagingRepositoryId=$STAGED_REPO_ID \
+        -DrepositoryDirectory="$SIGNATURES_DIR" \
+        -DnexusUrl=https://nexus.opendaylight.org/ \
+        -DstagingProfileId="425e43800fea70" \
+        -DserverId="opendaylight.staging"
+done