commit 23d3e8ceadc38a9daa6e68a22a43b49dadf9d7af
author Jakub Josef <jjosef@mirantis.com> Mon Nov 06 13:14:12 2017 +0000
committer Gerrit Code Review <gerrit2@a351f7b8d92b> Mon Nov 06 13:14:12 2017 +0000
tree 6a947f74d2fd551bb74762bdb3060f5de004d0f1
parent 831c94527cbe2c06140f3bf1e2df22ce062b6286
parent 4a36012cb3296f1a0c889ac0fe062d7668b696e7

Merge "Added ability to specify custom formula pkg repo"

jenkins/client/job/oscore/tests.yml

diff --git a/jenkins/client/job/oscore/tests.yml b/jenkins/client/job/oscore/tests.yml
index b25f8a5..5e5f743 100644
--- a/jenkins/client/job/oscore/tests.yml
+++ b/jenkins/client/job/oscore/tests.yml
@@ -104,6 +104,10 @@
                 type: string
                 description: Product milestone
                 default: "{{milestone}}"
+              TEST_TEMPEST_CONF:
+                type: string
+                description: Tempest configuration file path inside container
+                default: "{{tempest_conf}}"
               TEST_TEMPEST_TARGET:
                 type: string
                 description: Node to run tests
@@ -185,6 +189,10 @@
                 type: string
                 description: How much test threads to run
                 default: "2"
+              TEST_TEMPEST_CONF:
+                type: string
+                description: Tempest configuration file path inside container
+                default: "mcp.conf"
               TEST_MODEL:
                 type: string
                 description: Environment salt model

salt/master/formula/git/openstack.yml

diff --git a/salt/master/formula/git/openstack.yml b/salt/master/formula/git/openstack.yml
index 3472f2e..cd9df0a 100644
--- a/salt/master/formula/git/openstack.yml
+++ b/salt/master/formula/git/openstack.yml
@@ -8,10 +8,10 @@
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-aodh.git'
               revision: ${_param:salt_master_environment_revision}
-            #avinetworks:
-            #  source: git
-            #  address: '${_param:salt_master_environment_repository}/salt-formula-avinetworks.git'
-            #  revision: ${_param:salt_master_environment_revision}
+            avinetworks:
+              source: git
+              address: '${_param:salt_master_environment_repository}/salt-formula-avinetworks.git'
+              revision: ${_param:salt_master_environment_revision}
             barbican:
               source: git
               address: '${_param:salt_master_environment_repository}/salt-formula-barbican.git'

salt/master/formula/pkg/openstack.yml

diff --git a/salt/master/formula/pkg/openstack.yml b/salt/master/formula/pkg/openstack.yml
index 663572b..3d22c41 100644
--- a/salt/master/formula/pkg/openstack.yml
+++ b/salt/master/formula/pkg/openstack.yml
@@ -7,9 +7,9 @@
             aodh:
               source: pkg
               name: salt-formula-aodh
-            #avinetworks:
-            #  source: pkg
-            #  name: salt-formula-avinetworks
+            avinetworks:
+              source: pkg
+              name: salt-formula-avinetworks
             barbican:
               source: pkg
               name: salt-formula-barbican