commit ab8c3e0719c5ef9a7db39ba7b86b836c6d32ae7b
author Tatyana Leontovich <tleontovich@mirantis.com> Wed Jan 16 21:17:11 2019 +0200
committer Tatyana Leontovich <tleontovich@mirantis.com> Wed Jan 16 21:17:11 2019 +0200
tree de8a11badaeab411c364b8711dabc51a0d1fa852
parent bf2ff896801e8cb77038305bdf03f4628f9a52a6

Backport patches needed for 2018.11.0 and 3-2 contrail

Change-Id: I74300de65101094fe6ee864f91100e5af2297b6d

jobs/pipelines/deploy-cicd-and-run-tests.groovy

diff --git a/jobs/pipelines/deploy-cicd-and-run-tests.groovy b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
index 9ceea67..43c3f44 100644
--- a/jobs/pipelines/deploy-cicd-and-run-tests.groovy
+++ b/jobs/pipelines/deploy-cicd-and-run-tests.groovy
@@ -75,7 +75,7 @@
 }
 
 // main
-throttle(['fuel_devops_environment']) {
+//throttle(['fuel_devops_environment']) {
   node ("${NODE_NAME}") {
     try {
         // run deploy stages
@@ -106,4 +106,4 @@
 
     }
   }
-}
\ No newline at end of file
+//}
\ No newline at end of file

jobs/pipelines/swarm-run-pytest.groovy

diff --git a/jobs/pipelines/swarm-run-pytest.groovy b/jobs/pipelines/swarm-run-pytest.groovy
index 780229d..408bc14 100644
--- a/jobs/pipelines/swarm-run-pytest.groovy
+++ b/jobs/pipelines/swarm-run-pytest.groovy
@@ -56,6 +56,7 @@
                 if (steps.contains('openstack')) {
                     sources += """
                     export TEMPEST_IMAGE_VERSION=${TEMPEST_IMAGE_VERSION}
+                    export TEMPEST_TARGET=${TEMPEST_TARGET}
                     # TODO: . ./tcp_tests/utils/env_keystonercv3\n"""
                 }
                 def installed = steps.collect {"""\