Merge "Remove path prefix with $ERROR_LOG"

diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
new file mode 100644 (file)
index 0000000..76edf60
--- /dev/null
+++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+    name: mdsal-csit-dom-data-broker-explicit-leader-movement-longevity
+    jobs:
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'controller'
+
+    # The functionality under test
+    functionality: 'ddb-expl-lead-movement-longevity'
+
+    # Project branches
+    stream:
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+
+    install:
+      - only:
+          scope: 'only'
+
+    # Features to install
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app
+
+    # Built timeout
+    build-timeout: '1500'

diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index d2b182eab7c12d1fc6ea8195afea8e04d622a133..f26188442a89ed599dd707fe92c7f028626a76ad 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -155,12 +155,6 @@ disable_service q-l3
 PUBLIC_INTERFACE=br100
 EOF
 
-if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
-cat >> ${local_conf_file_name} << EOF
-Q_L3_ENABLED=True
-ODL_L3=${ODL_L3}
-
-EOF
 if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
 cat >> ${local_conf_file_name} << EOF
 [[post-config|\$NEUTRON_CONF]]
@@ -533,20 +527,6 @@ do
     ${SSH} ${!CONTROLIP} "bash /tmp/get_devstack.sh"
     create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}"
     scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf
-    if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
-        # Workaround for problems with latest versions/specified versions in requirements of openstack
-        # Openstacksdk,libvirt-python -> the current version does not work with  Mitaka diue to some requirements
-        # conflict and breaks when trying to stack
-        # paramiko -> Problems with tempest tests due to paramiko incompatibility with pycrypto.
-        # the problem has been solved with  version 1.17. If the latest version of paramiko is used, it causes
-        # other timeout problems
-        ssh ${!CONTROLIP} "cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; git checkout stable/mitaka; sed -i /openstacksdk/d upper-constraints.txt; sed -i /libvirt-python/d upper-constraints.txt; sed -i /paramiko/d upper-constraints.txt"
-        scp "${WORKSPACE}/manual_install_package.sh"  "${!CONTROLIP}:/tmp"
-        ssh ${!CONTROLIP} "sudo pip install deprecation"
-        # Fix for recent requirements update  in the  master branch of the sdk.The section must be replaced with a better fix.
-        ssh "${!CONTROLIP}" "sh /tmp/manual_install_package.sh https://github.com/openstack/python-openstacksdk python-openstacksdk 0.9.14"
-        ssh "${!CONTROLIP}" "sh /tmp/manual_install_package.sh https://github.com/paramiko/paramiko paramiko 1.17"
-    fi
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
     ssh ${!CONTROLIP} "ls -lrt /opt/stack/devstack/nohup.out"
@@ -569,9 +549,6 @@ do
     ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh"
     create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}"
     scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf
-    if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
-        ssh ${!COMPUTEIP} "cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; git checkout stable/mitaka; sed -i /libvirt-python/d upper-constraints.txt"
-    fi
     ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"
     os_node_list+=(${!COMPUTEIP})

diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml
index 53b59d33a6fc75f5504c84f3e4132ef5b00c914b..acfc7c345bb957d5fffdcf83b5854b2c15917228 100644 (file)
--- a/jjb/packaging/puppet.yaml
+++ b/jjb/packaging/puppet.yaml
@@ -77,7 +77,7 @@
           artifacts: '{archive-artifacts}'
       - string:
           name: TEST_SUITE
-          default: 'acceptance_dock'
+          default: 'acceptance6_dock'
           description: 'Set of tests to execute, Rakefile task'
 
     scm:
@@ -95,3 +95,19 @@
 
     triggers:
       - timed: '@daily'
+      - gerrit:
+          server-name: '{server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'puppet-test-full'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index e7d785729c546eff35f5eaef5b1833d87424c8eb..663e00b9ee28db702ea14af4b0922974232f0203 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -164,6 +164,7 @@
         controller-csit-1node-notifications-longevity-only-nitrogen,
         controller-csit-3node-drb-partnheal-longevity-only-nitrogen,
         controller-csit-3node-drb-precedence-longevity-only-nitrogen,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen,
         distribution-deploy-nitrogen,
         distribution-offline-nitrogen,
         openflowplugin-csit-1node-periodic-longevity-only-nitrogen
@@ -173,6 +174,7 @@
         controller-csit-3node-cs-partnheal-longevity-only-carbon,
         controller-csit-3node-drb-partnheal-longevity-only-carbon,
         controller-csit-3node-drb-precedence-longevity-only-carbon,
+        controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon,
         distribution-deploy-carbon,
         distribution-offline-carbon,
         distribution4-deploy-carbon,
@@ -246,7 +248,6 @@
         groupbasedpolicy-csit-1node-6node-all-nitrogen,
         groupbasedpolicy-csit-1node-6node-only-nitrogen,
         groupbasedpolicy-csit-1node-openstack-liberty-openstack-nitrogen,
-        groupbasedpolicy-csit-1node-openstack-mitaka-openstack-nitrogen,
         groupbasedpolicy-csit-1node-sxp-only-nitrogen,
         groupbasedpolicy-csit-3node-clustering-all-nitrogen,
         groupbasedpolicy-csit-3node-clustering-only-nitrogen,
@@ -276,18 +277,12 @@
         netconf-csit-1node-periodic-scale-only-nitrogen,
         netconf-csit-1node-userfeatures-all-nitrogen,
         netconf-csit-1node-userfeatures-only-nitrogen,
-        netconf-csit-3node-cluster-stress-all-nitrogen,
-        netconf-csit-3node-cluster-stress-only-nitrogen,
         netconf-csit-3node-clustering-all-nitrogen,
         netconf-csit-3node-clustering-only-nitrogen,
         netconf-csit-3node-periodic-clustering-scale-all-nitrogen,
         netconf-csit-3node-periodic-clustering-scale-only-nitrogen,
         netide-csit-1node-basic-all-nitrogen,
         netide-csit-1node-basic-only-nitrogen,
-        netvirt-csit-1node-openstack-mitaka-upstream-learn-nitrogen,
-        netvirt-csit-1node-openstack-mitaka-upstream-stateful-nitrogen,
-        netvirt-csit-1node-openstack-mitaka-upstream-stateful-snat-conntrack-nitrogen,
-        netvirt-csit-1node-openstack-mitaka-upstream-transparent-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-extensions-sfc-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
@@ -301,10 +296,6 @@
         netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
-        netvirt-csit-3node-openstack-mitaka-upstream-learn-nitrogen,
-        netvirt-csit-3node-openstack-mitaka-upstream-stateful-nitrogen,
-        netvirt-csit-3node-openstack-mitaka-upstream-stateful-snat-conntrack-nitrogen,
-        netvirt-csit-3node-openstack-mitaka-upstream-transparent-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-nitrogen,
@@ -313,18 +304,12 @@
         netvirt-csit-3node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-nitrogen,
         netvirt-csit-3node-openstack-newton-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-nitrogen,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-learn-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-nitrogen,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-nitrogen,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-nitrogen,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-nitrogen,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-nitrogen,
@@ -401,7 +386,6 @@
         vtn-csit-1node-coordinator-only-nitrogen,
         vtn-csit-1node-manager-all-nitrogen,
         vtn-csit-1node-manager-only-nitrogen,
-        vtn-csit-1node-openstack-mitaka-neutron-nitrogen,
         vtn-csit-1node-openstack-newton-neutron-nitrogen,
         vtn-csit-3node-manager-all-nitrogen,
         vtn-csit-3node-manager-only-nitrogen,
@@ -450,6 +434,8 @@
         didm-csit-1node-discovery-only-carbon,
         distribution-csit-1node-userfeatures-all-carbon,
         distribution-csit-1node-userfeatures-only-carbon,
+        distribution-csit4-1node-userfeatures-all-carbon,
+        distribution-csit4-1node-userfeatures-only-carbon,
         dluxapps-csit-1node-yangman-all-carbon,
         dluxapps-csit-1node-yangman-only-carbon,
         eman-csit-1node-model-all-carbon,
@@ -461,7 +447,6 @@
         groupbasedpolicy-csit-1node-6node-all-carbon,
         groupbasedpolicy-csit-1node-6node-only-carbon,
         groupbasedpolicy-csit-1node-openstack-liberty-openstack-carbon,
-        groupbasedpolicy-csit-1node-openstack-mitaka-openstack-carbon,
         groupbasedpolicy-csit-1node-sxp-only-carbon,
         groupbasedpolicy-csit-3node-clustering-all-carbon,
         groupbasedpolicy-csit-3node-clustering-only-carbon,
@@ -491,18 +476,12 @@
         netconf-csit-1node-periodic-scale-only-carbon,
         netconf-csit-1node-userfeatures-all-carbon,
         netconf-csit-1node-userfeatures-only-carbon,
-        netconf-csit-3node-cluster-stress-all-carbon,
-        netconf-csit-3node-cluster-stress-only-carbon,
         netconf-csit-3node-clustering-all-carbon,
         netconf-csit-3node-clustering-only-carbon,
         netconf-csit-3node-periodic-clustering-scale-all-carbon,
         netconf-csit-3node-periodic-clustering-scale-only-carbon,
         netide-csit-1node-basic-all-carbon,
         netide-csit-1node-basic-only-carbon,
-        netvirt-csit-1node-openstack-mitaka-upstream-learn-carbon,
-        netvirt-csit-1node-openstack-mitaka-upstream-stateful-carbon,
-        netvirt-csit-1node-openstack-mitaka-upstream-stateful-snat-conntrack-carbon,
-        netvirt-csit-1node-openstack-mitaka-upstream-transparent-carbon,
         netvirt-csit-1node-openstack-newton-nodl-v2-extensions-sfc-carbon,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
@@ -516,10 +495,6 @@
         netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
-        netvirt-csit-3node-openstack-mitaka-upstream-learn-carbon,
-        netvirt-csit-3node-openstack-mitaka-upstream-stateful-carbon,
-        netvirt-csit-3node-openstack-mitaka-upstream-stateful-snat-conntrack-carbon,
-        netvirt-csit-3node-openstack-mitaka-upstream-transparent-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-carbon,
@@ -528,18 +503,12 @@
         netvirt-csit-3node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-carbon,
         netvirt-csit-3node-openstack-newton-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-carbon,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-carbon,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-carbon,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-carbon,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-learn-carbon,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-carbon,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-carbon,
@@ -616,7 +585,6 @@
         vtn-csit-1node-coordinator-only-carbon,
         vtn-csit-1node-manager-all-carbon,
         vtn-csit-1node-manager-only-carbon,
-        vtn-csit-1node-openstack-mitaka-neutron-carbon,
         vtn-csit-1node-openstack-newton-neutron-carbon,
         vtn-csit-3node-manager-all-carbon,
         vtn-csit-3node-manager-only-carbon,
@@ -668,7 +636,6 @@
         groupbasedpolicy-csit-1node-6node-all-boron,
         groupbasedpolicy-csit-1node-6node-only-boron,
         groupbasedpolicy-csit-1node-openstack-liberty-openstack-boron,
-        groupbasedpolicy-csit-1node-openstack-mitaka-openstack-boron,
         groupbasedpolicy-csit-3node-clustering-all-boron,
         groupbasedpolicy-csit-3node-clustering-only-boron,
         l2switch-csit-1node-periodic-host-scalability-daily-only-boron,
@@ -694,18 +661,12 @@
         netconf-csit-1node-periodic-scale-only-boron,
         netconf-csit-1node-userfeatures-all-boron,
         netconf-csit-1node-userfeatures-only-boron,
-        netconf-csit-3node-cluster-stress-all-boron,
-        netconf-csit-3node-cluster-stress-only-boron,
         netconf-csit-3node-clustering-all-boron,
         netconf-csit-3node-clustering-only-boron,
         netconf-csit-3node-periodic-clustering-scale-all-boron,
         netconf-csit-3node-periodic-clustering-scale-only-boron,
         netide-csit-1node-basic-all-boron,
         netide-csit-1node-basic-only-boron,
-        netvirt-csit-1node-openstack-mitaka-upstream-learn-boron,
-        netvirt-csit-1node-openstack-mitaka-upstream-stateful-boron,
-        netvirt-csit-1node-openstack-mitaka-upstream-stateful-snat-conntrack-boron,
-        netvirt-csit-1node-openstack-mitaka-upstream-transparent-boron,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-1node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron,
@@ -718,10 +679,6 @@
         netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
-        netvirt-csit-3node-openstack-mitaka-upstream-learn-boron,
-        netvirt-csit-3node-openstack-mitaka-upstream-stateful-boron,
-        netvirt-csit-3node-openstack-mitaka-upstream-stateful-snat-conntrack-boron,
-        netvirt-csit-3node-openstack-mitaka-upstream-transparent-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-nodl-v2-upstream-stateful-snat-conntrack-boron,
@@ -730,18 +687,12 @@
         netvirt-csit-3node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-3node-openstack-newton-upstream-stateful-snat-conntrack-boron,
         netvirt-csit-3node-openstack-newton-upstream-transparent-boron,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-learn-boron,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-stateful-boron,
-        netvirt-csit-hwvtep-1node-openstack-mitaka-upstream-transparent-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-nodl-v2-upstream-transparent-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-learn-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-stateful-boron,
         netvirt-csit-hwvtep-1node-openstack-newton-upstream-transparent-boron,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-learn-boron,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-stateful-boron,
-        netvirt-csit-hwvtep-3node-openstack-mitaka-upstream-transparent-boron,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-learn-boron,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
         netvirt-csit-hwvtep-3node-openstack-newton-nodl-v2-upstream-transparent-boron,
@@ -750,11 +701,9 @@
         netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-boron,
         netvirt-legacy-csit-1node-openstack-basic-all-boron,
         netvirt-legacy-csit-1node-openstack-basic-only-boron,
-        netvirt-legacy-csit-1node-openstack-mitaka-upstream-boron,
         netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-boron,
         netvirt-legacy-csit-1node-openstack-newton-upstream-boron,
         netvirt-legacy-csit-3node-clustering-only-boron,
-        netvirt-legacy-csit-3node-openstack-mitaka-upstream-boron,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-boron,
         netvirt-legacy-csit-3node-openstack-newton-upstream-boron,
         nic-csit-1node-basic-all-boron,
@@ -822,7 +771,6 @@
         vtn-csit-1node-coordinator-only-boron,
         vtn-csit-1node-manager-all-boron,
         vtn-csit-1node-manager-only-boron,
-        vtn-csit-1node-openstack-mitaka-neutron-boron,
         vtn-csit-1node-openstack-newton-neutron-boron,
         vtn-csit-3node-manager-all-boron,
         vtn-csit-3node-manager-only-boron
@@ -868,7 +816,6 @@
         groupbasedpolicy-csit-1node-6node-all-beryllium,
         groupbasedpolicy-csit-1node-6node-only-beryllium,
         groupbasedpolicy-csit-1node-openstack-liberty-openstack-beryllium,
-        groupbasedpolicy-csit-1node-openstack-mitaka-openstack-beryllium,
         groupbasedpolicy-csit-3node-clustering-all-beryllium,
         groupbasedpolicy-csit-3node-clustering-only-beryllium,
         l2switch-csit-1node-periodic-host-scalability-daily-only-beryllium,
@@ -892,8 +839,6 @@
         netconf-csit-1node-periodic-scale-only-beryllium,
         netconf-csit-1node-userfeatures-all-beryllium,
         netconf-csit-1node-userfeatures-only-beryllium,
-        netconf-csit-3node-cluster-stress-all-beryllium,
-        netconf-csit-3node-cluster-stress-only-beryllium,
         netconf-csit-3node-clustering-all-beryllium,
         netconf-csit-3node-clustering-only-beryllium,
         netconf-csit-3node-periodic-clustering-scale-all-beryllium,
@@ -902,11 +847,9 @@
         netide-csit-1node-basic-only-beryllium,
         netvirt-legacy-csit-1node-openstack-basic-all-beryllium,
         netvirt-legacy-csit-1node-openstack-basic-only-beryllium,
-        netvirt-legacy-csit-1node-openstack-mitaka-upstream-beryllium,
         netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-beryllium,
         netvirt-legacy-csit-1node-openstack-newton-upstream-beryllium,
         netvirt-legacy-csit-3node-clustering-only-beryllium,
-        netvirt-legacy-csit-3node-openstack-mitaka-upstream-beryllium,
         netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-beryllium,
         netvirt-legacy-csit-3node-openstack-newton-upstream-beryllium,
         nic-csit-1node-basic-all-beryllium,
@@ -964,6 +907,5 @@
         vtn-csit-1node-coordinator-only-beryllium,
         vtn-csit-1node-manager-all-beryllium,
         vtn-csit-1node-manager-only-beryllium,
-        vtn-csit-1node-openstack-mitaka-neutron-beryllium,
         vtn-csit-1node-openstack-newton-neutron-beryllium
 # CSIT TESTS END SED MARKER

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 8d981d718999b92b40c99eaa4100640bdf173094..2f309173fb5edde835affdbc92d719e9a5afc2a2 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -386,7 +386,7 @@
 
     triggers:
       - reverse:
-          jobs: 'builder-merge'
+          jobs: 'builder-jjb-merge'
 
     builders:
       - shell: |

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index b9917554af48ece233ddba41adc05b55d58b4352..e6fdab106d97dab09fc4d30c1b4fe2bf49666d71 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -37,10 +37,6 @@
           karaf-version: karaf3
 
     openstack:
-      - mitaka:
-          openstack-branch: 'stable/mitaka'
-          odl-ml2-branch: 'stable/mitaka'
-          openstack_system_image: 'CentOS 7 - devstack-mitaka - 20170314-2255'
       - newton:
           openstack-branch: 'stable/newton'
           odl-ml2-branch: 'stable/newton'