Merge "Add telemetry jobs to Jenkins"

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 429eb3fc452256c87db0f15c474d61bd10f69b0f..d16f38c894fc2cb7085d603f047f37e8fe4bc73f 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -19,25 +19,25 @@
           next-release-tag: '{stream}'
           branch: 'master'
           integration-test: fluorine
-          extra-mvn-opts: -Dsft.heap.max=4g
+          extra-mvn-opts: -P\!karaf -Dsft.heap.max=4g
       - oxygen:
           next-release-tag: '{stream}'
           branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -Dsft.heap.max=4g
+          extra-mvn-opts: -P\!karaf -Dsft.heap.max=4g
       - nitrogen:
           # Run once a week (Sunday) now that Fluorine branch is cut, and Oxygen is pending release
           cron: 'H 12 * * 0'
           next-release-tag: '{stream}'
           branch: 'stable/nitrogen'
           integration-test: nitrogen
-          extra-mvn-opts: -Dsft.heap.max=4g
+          extra-mvn-opts: -P\!karaf -Dsft.heap.max=4g
       - carbon:
           next-release-tag: '{stream}'
           branch: 'stable/carbon'
           integration-test: carbon
           karaf-version: karaf3
-          extra-mvn-opts: -Dskip.karaf4.featureTest=true
+          extra-mvn-opts: -P\!karaf -Dskip.karaf4.featureTest=true
 
     project: releng/autorelease
     project-name: autorelease

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 560f30a362a3eb9be8444947c65a47bd7202d3ee..b23a9124baebe5a5b83982139bc5891d680604b3 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -54,11 +54,12 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    ############
-    # Defaults #
-    ############
+    ######################
+    # Default parameters #
+    ######################
 
     build-node: '{build-node}'
+    cron: 'H 0 * * *'
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -70,7 +71,6 @@
     project-type: freestyle
     node: '{build-node}'
     jdk: '{java-version}'
-    cron: 'H 0 * * *'
 
     properties:
       - lf-infra-properties:
@@ -210,6 +210,17 @@
 
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
+
+    ######################
+    # Default parameters #
+    ######################
+
+    cron: '@weekly'
+
+    #####################
+    # Job configuration #
+    #####################
+
     project-type: freestyle
     node: centos7-builder-2c-1g
 
@@ -234,6 +245,7 @@
           choosing-strategy: default
 
     triggers:
+      - timed: '{cron}'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:

diff --git a/jjb/autorelease/validate-autorelease-fluorine.yaml b/jjb/autorelease/validate-autorelease-fluorine.yaml
index 559be4acee173a2d0589e5e2422776f6279ab0d0..621a3be01c9d30db88320bd7b512edbd212b4a36 100644 (file)
--- a/jjb/autorelease/validate-autorelease-fluorine.yaml
+++ b/jjb/autorelease/validate-autorelease-fluorine.yaml
@@ -19,8 +19,6 @@
           project: daexim
       - genius:
           project: genius
-      - honeycomb-vbd:
-          project: honeycomb/vbd
       - infrautils:
           project: infrautils
       - integration-distribution:
@@ -39,5 +37,3 @@
           project: openflowplugin
       - ovsdb:
           project: ovsdb
-      - sfc:
-          project: sfc

diff --git a/jjb/autorelease/validate-autorelease-oxygen.yaml b/jjb/autorelease/validate-autorelease-oxygen.yaml
index 4a4f99a49edf5caa74e33b6a4938c15aeb1f0168..e73fc2dd29a03263c829669c6675e1da6a884528 100644 (file)
--- a/jjb/autorelease/validate-autorelease-oxygen.yaml
+++ b/jjb/autorelease/validate-autorelease-oxygen.yaml
@@ -5,7 +5,7 @@
     jobs:
       - '{project-name}-validate-autorelease-{stream}'
     stream: oxygen
-    branch: master
+    branch: stable/oxygen
     project-name:
       - aaa:
           project: aaa
@@ -73,3 +73,5 @@
           project: tsdr
       - usc:
           project: usc
+      - vtn:
+          project: vtn

diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh
index fc7e0466a15b48f354dfb8d2a8399f6454ca63a4..54bd1203f62b0bb01728a9d132ae6498980b5ca3 100644 (file)
--- a/jjb/autorelease/version-bump.sh
+++ b/jjb/autorelease/version-bump.sh
@@ -16,6 +16,7 @@ echo "---> version-bump.sh"
 # The only purpose of RELEASE_TAG in this script is to set the Gerrit topic.
 # It is also used as a placeholder for version bumping but gets wiped out
 # immediately to bump versions by x.y.(z+1).
+TOPIC="${RELEASE_TAG}"
 RELEASE_TAG="${STREAM^}"
 
 mkdir -p "$WORKSPACE/archives"
@@ -131,7 +132,7 @@ git submodule foreach git checkout -f
 if [ "$DRY_RUN" = "false" ]
 then
     # Push up patches last, as long as nothing failed.
-    git submodule foreach git review --yes -t "${RELEASE_TAG}"
+    git submodule foreach git review --yes -t "${TOPIC}"
 fi
 
 echo "Version bumping complete."

diff --git a/jjb/requirements.txt b/jjb/requirements.txt
index c6ee1eab24d31ca84ce8100b3ef918dddb610941..61d8a13567be36043c93cc83417f1e9a9f6e76bb 100644 (file)
--- a/jjb/requirements.txt
+++ b/jjb/requirements.txt
@@ -1 +1 @@
-jenkins-job-builder==1.6.2
+jenkins-job-builder==2.0.3