Merge changes from topic 'global-jjb-stack'

* changes:
  Remove unused csit macros and defaults
  Use new stack macros from global-jjb csit-apex
  Use new stack macros from gjjb csit-openstack
  Use new stack macros from gjjb csit-3node-docker
  Use new stack macros from global-jjb csit-3node
  Use new stack macros from global-jjb csit-1node

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index afafe62d7e29b3240160f3cc6ea249dcf04a1740..48faad2e1bbbd0643ae3885b094e3eeccaaacc77 100644 (file)
--- 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/genius/genius.yaml b/jjb/genius/genius.yaml
index 4036ef22cef63f6121736caa746a13d2946decf2..6aad10ae9aafcc58efe4c6af2f1263da3946ba5b 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -11,6 +11,9 @@
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - 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: 'genius'
     project-name: 'genius'

diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml
index 3b30d6118b5dde044892b1da963b149d9cb72ce6..7805f8dbcabeca30da4395e8e10d5436ba7dec96 100644 (file)
--- 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 a62d9800a3a81a313e9e7f58f9553ab12b795477..c8c482541170477f1d8861c860419d8c89ffef00 100644 (file)
--- 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/telemetry/telemetry-csit-basic.yaml b/jjb/telemetry/telemetry-csit-basic.yaml
new file mode 100644 (file)
index 0000000..b7f9829
--- /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: ''