Merge "Added TSDR CSIT Jobs into distribution-test Job"

diff --git a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
index 6b2b445113623ca66787c33145992e3d2be1567e..433c0b8ededf9e035b84695a06745244cd76ef92 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
+++ b/jjb/integration/include-raw-integration-deploy-devstack-testing.sh
@@ -7,16 +7,16 @@ SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' '
 echo "Starting Robot test suites ${SUITES} ..."
 
 pybot -e exclude \
--v WORKSPACE:/tmp -v USER_HOME:$HOME -L TRACE \
+-v WORKSPACE:$WORKSPACE -v USER_HOME:$HOME -L TRACE \
 -v DEVSTACK_SYSTEM_USER:$USER \
--v DEVSTACK_SYSTEM_IP:$ODL_SYSTEM_IP \
+-v DEVSTACK_SYSTEM_IP:$OPENSTACK_CONTROL_NODE_IP \
 -v DEFAULT_LINUX_PROMPT:\]\> \
 -v OPENSTACK_BRANCH:$OPENSTACK_BRANCH \
 -v ODL_VERSION:$ODL_VERSION \
 -v TEMPEST_REGEX:$TEMPEST_REGEX ${SUITES} || true
 
-scp $ODL_SYSTEM_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/
-scp -r $ODL_SYSTEM_IP:/opt/stack/logs/*karaf* $WORKSPACE/
+scp $OPENSTACK_CONTROL_NODE_IP:/opt/stack/logs/devstacklog.txt $WORKSPACE/
+scp -r $OPENSTACK_CONTROL_NODE_IP:/opt/stack/logs/*karaf* $WORKSPACE/
 
 # vim: ts=4 sw=4 sts=4 et ft=sh :
 

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 66e5ea162a394ae206b676db938a5805d1acf78e..4d0b6b2c95017e07d8b6bdb590a6cf98392a2579 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@ -100,6 +100,16 @@ cat >> ${local_conf_file_name} << EOF
 [[post-config|/etc/neutron/plugins/ml2/ml2_conf.ini]]
 [agent]
 minimize_polling=True
+
+[[post-config|/etc/neutron/dhcp_agent.ini]]
+[DEFAULT]
+force_metadata = True
+enable_isolated_metadata = True
+
+[[post-config|/etc/nova/nova.conf]]
+[DEFAULT]
+force_config_drive = False
+
 EOF
 
 echo "local.conf Created...."

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 963cffe96b03084e4ed167562e86b9d986e1188b..9d4dc33bc68f01d27924102e651811bb7f5db56a 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -689,7 +689,7 @@
         - archive:
             artifacts: '*log*'
         - email-notification:
-            email-prefix: '[project]'
+            email-prefix: '[{project}]'
 
 - job-template:
     name: '{project}-csit-1node-openstack-{openstack}-{functionality}-{stream}'
@@ -778,7 +778,7 @@
         - archive:
             artifacts: '*log*'
         - email-notification:
-            email-prefix: '[project]'
+            email-prefix: '[{project}]'
 
 - job-template:
     name: '{project}-csit-3node-openstack-{openstack}-{functionality}-{stream}'
@@ -872,4 +872,4 @@
         - archive:
             artifacts: '*log*'
         - email-notification:
-            email-prefix: '[project]'
+            email-prefix: '[{project}]'

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 7b1ef343382a62fae6370c7ba1fb735914509b98..a54b7b97e8fb66fa74bdd982bab20819f04edd43 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -45,6 +45,7 @@
     integration-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414693976622'
     integration-distribution-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414693976622'
     iotdm-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1418228763195'
+    jsonrpc-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1461352069244'
     kafkaproducer-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1452526644682'
     l2switch-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1414694505032'
     lacp-settings: 'org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig1418417438677'