Code Review / releng / builder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw (from parent 2: 3455276)
Merge "BUG-2625: validaste snmp using jdk8 only"
authorThanh Ha <thanh.ha@linuxfoundation.org>
Wed, 3 Feb 2016 23:18:21 +0000 (23:18 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 3 Feb 2016 23:18:21 +0000 (23:18 +0000)
12 files changed:
jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh patch | blob | history
jjb/autorelease/include-raw-autorelease-maven-deploy.sh patch | blob | history
jjb/controller/controller-csit-clustering-lithium.yaml patch | blob | history
jjb/controller/controller-csit-clustering.yaml patch | blob | history
jjb/nic/nic-csit-basic.yaml patch | blob | history
jjb/nic/nic-csit-vtnrenderer.yaml patch | blob | history
jjb/releng-jobs.yaml patch | blob | history
jjb/snmp4sdn/snmp4sdn.cfg patch | blob | history
jjb/snmp4sdn/snmp4sdn.yaml patch | blob | history
jjb/tsdr/tsdr-csit-cassandra.yaml patch | blob | history
jjb/tsdr/tsdr-csit-hbase.yaml patch | blob | history
jjb/tsdr/tsdr-csit-hsqldb.yaml patch | blob | history

diff --git a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
index efbfab6a5bd87a20f0cf314401a3df1878d9fc4c..ff7cf11a3f5b7efc4e9691f8187cbd8ed430279e 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
+++ b/jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
 ##############################################################################
-# Copyright (c) 2015 The Linux Foundation and others.
+# Copyright (c) 2015, 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
@@ -9,7 +9,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-NEXUSURL=http://nexus.opendaylight.org/content/repositories/
+NEXUSURL=https://nexus.opendaylight.org/staged-repos/
 VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
 REPOID=`grep "Created staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
 
diff --git a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
index 41f344ff228b1df12d9983e20fd5819649488fbe..8bf44222416baeb9048907f0aadb2d861a23e910 100644 (file)
--- a/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
+++ b/jjb/autorelease/include-raw-autorelease-maven-deploy.sh
@@ -13,13 +13,10 @@
 # we are likely releasing a release candidate. We should skip closing the
 # Nexus staging repository so that we can sign the artifacts.
 SKIP_STAGING_CLOSE=false
-# TODO: Figure out a solution to Open staging repos not being available
-#       immediately. This means integration tests cannot reliably download and
-#       test the new build if we leave the staging repo open.
-# if [ "${DATESTAMP}" == "false" ]
-# then
-#     SKIP_STAGING_CLOSE=true
-# fi
+if [ "${DATESTAMP}" == "false" ]
+then
+    SKIP_STAGING_CLOSE=true
+fi
 
 mkdir -p hide/from/pom/files
 cd hide/from/pom/files
@@ -28,8 +25,7 @@ mkdir -p m2repo/org/opendaylight/
 (IFS='
 '
 for m in `xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' ../../../../pom.xml`; do
-    rsync -avz --exclude 'maven-metadata-local.xml' \
-               --exclude 'maven-metadata-*' \
+    rsync -avz --exclude 'maven-metadata*' \
                --exclude '_remote.repositories' \
                --exclude 'resolver-status.properties' \
                "/tmp/r/org/opendaylight/$m" m2repo/org/opendaylight/
@@ -37,8 +33,7 @@ done)
 
 # Add exception for integration project since they release under the
 # integration top-level project.
-rsync -avz --exclude 'maven-metadata-local.xml' \
-           --exclude 'maven-metadata-*' \
+rsync -avz --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
            "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/
diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml
index 04de420ba88d30e86b35e1e40ccd1dc5e8838706..8b9dabcf391aebcfba1e3e0531d3a65518dd0314 100644 (file)
--- a/jjb/controller/controller-csit-clustering-lithium.yaml
+++ b/jjb/controller/controller-csit-clustering-lithium.yaml
@@ -21,7 +21,7 @@
         # Bug 4676 means -all- would fail.
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
 
     # Robot custom options
     robot-options: ''
diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index 92e9877016ec91c03ebc45a8f3482400666005e3..68fc79d3732fd18ee58a017a00a303e2a6e67d63 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -26,7 +26,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
 
     # Robot custom options
     robot-options: ''
diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 8443e1c8ddf9382fd31fc4bcd267948a9e044258..8e3387ec92afd0671577829a5c4ca8e7762e8789 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-nic-core-service-mdsal,odl-nic-console'
+    install-features: 'odl-nic-console'
 
     # Robot custom options
     robot-options: ''
diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 4123c4a7737353de4b8154d2b804206ed1f22b9c..35675a3c80845eed778046ee7495037abf879975 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -12,6 +12,10 @@
 
     # Project branches
     stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: 'openjdk7'
@@ -23,7 +27,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-nic-core,odl-nic-console,odl-nic-renderer-vtn'
+    install-features: 'odl-nic-console,odl-nic-renderer-vtn'
 
     # Robot custom options
     robot-options: ''
diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8ce116a7faa95650a916c6ccc93a4bf57932f7b1..2adbc8d251e7cf13b65cd66a553f91f09ebd2d1f 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -20,7 +20,7 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: 5
@@ -84,7 +84,7 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
@@ -151,10 +151,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -202,6 +202,7 @@
 
 - job-template:
     name: 'builder-weekly'
+    disabled: true
     node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
@@ -212,10 +213,10 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -288,7 +289,7 @@
 
     logrotate:
         daysToKeep: 7
-        numToKeep: 10
+        numToKeep: 3
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
diff --git a/jjb/snmp4sdn/snmp4sdn.cfg b/jjb/snmp4sdn/snmp4sdn.cfg
index 8ef69213a31582796a775676e6624f31786addcd..08c8642e77309d0ba16d06f14a50d07d0e634d7a 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.cfg
+++ b/jjb/snmp4sdn/snmp4sdn.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium
diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 5d64f1302cba9b734beb8536f61c6caed47ff392..a3c6443e5ab447a5b9b4099057f8c354b09de62a 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml
index 6b353588f00bb5b20a76c5eb02700b5ce7c4005a..56539a19148fe6246a6e4c879324d97682c0e19c 100644 (file)
--- a/jjb/tsdr/tsdr-csit-cassandra.yaml
+++ b/jjb/tsdr/tsdr-csit-cassandra.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector'
+    install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
     robot-options: ' '
diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml
index dcf7e5efbbcd118c7ed4834000545b028db405c2..5aa11c15bbf86df568dfae3d685365b0da011e10 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hbase.yaml
+++ b/jjb/tsdr/tsdr-csit-hbase.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector'
+    install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
     robot-options: ' '
diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 432966ae11786a35d799e12afa97db9a961d41f8..f3428a4ac37d4874f209bfb2e41624696df64fc8 100644 (file)
--- a/jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml
@@ -29,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector'
+    install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
     robot-options: ' '
Release Engineering Build infrastructure (Jenkins Job Builder, Packer, etc)