From: Sam Hague <shague@redhat.com>
Date: Thu, 10 Jan 2019 16:23:18 +0000 (+0000)
Subject: Merge "Trigger apex netvirt csit job on genius patches"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=3b7ee333f1b20d16cbd2c00445cc28c10de2857e;hp=4d7009eab6f1c68a75554484be4885a26b1bef4b

Merge "Trigger apex netvirt csit job on genius patches"
---

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index afafe62d7..48faad2e1 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -5,11 +5,11 @@
       - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
       - 'autorelease-release-{stream}':
-          build-node: centos7-autorelease-8c-32g
+          build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}':
-          build-node: centos7-autorelease-8c-32g
+          build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 3b30d6118..7805f8dbc 100644
--- a/jjb/openflowplugin/openflowplugin.yaml
+++ b/jjb/openflowplugin/openflowplugin.yaml
@@ -12,6 +12,9 @@
           rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f
       - odl-maven-jobs
 
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
     stream: neon
     project: 'openflowplugin'
     project-name: 'openflowplugin'
diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index a62d9800a..c8c482541 100644
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -11,6 +11,9 @@
           rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
       - odl-maven-jobs
 
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
     stream: neon
     project: 'ovsdb'
     project-name: 'ovsdb'
diff --git a/jjb/packaging/test-puppet.sh b/jjb/packaging/test-puppet.sh
index 8185ae3fe..c0aace6c0 100644
--- a/jjb/packaging/test-puppet.sh
+++ b/jjb/packaging/test-puppet.sh
@@ -28,13 +28,13 @@ set +e
 # shellcheck disable=SC1090
 source "$HOME/.rvm/scripts/rvm"
 set -e
-rvm install 2.4.0
+rvm install 2.6.0
 set -x
 ruby --version
 # This has to be done as a login shell to get rvm fns
 # https://rvm.io/support/faq#what-shell-login-means-bash-l
 # http://superuser.com/questions/306530/run-remote-ssh-command-with-full-login-shell
-bash -lc "rvm use 2.4.0 --default"
+bash -lc "rvm use 2.6.0 --default"
 ruby --version
 
 # Update RubyGems using itself, as OS package may be old
diff --git a/jjb/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml
new file mode 100644
index 000000000..b7f9829a6
--- /dev/null
+++ b/jjb/telemetry/telemetry-csit-basic.yaml
@@ -0,0 +1,27 @@
+---
+- project:
+    name: telemetry-csit-basic
+    jobs:
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
+
+    # The project name
+    project: 'telemetry'
+
+    # The functionality under test
+    functionality: 'basic'
+
+    # Project branches
+    stream:
+      - neon:
+          branch: 'master'
+
+    install:
+      - all:
+          scope: 'all'
+
+    # Features to install
+    install-features: 'odl-telemetry-all'
+
+    # Robot custom options
+    robot-options: ''