Merge pull request #201 from Mirantis/add_defaults
add defaults for cicd
diff --git a/jenkins/client/job/opencontrail/build/init.yml b/jenkins/client/job/opencontrail/build/init.yml
index 759d78a..b4853b6 100644
--- a/jenkins/client/job/opencontrail/build/init.yml
+++ b/jenkins/client/job/opencontrail/build/init.yml
@@ -1,3 +1,4 @@
classes:
- system.jenkins.client.job.opencontrail.build.generic
+ - system.jenkins.client.job.opencontrail.build.test
- system.jenkins.client.job.opencontrail.build.dpdk-extra
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 5258fb2..9f65ee3 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -5,7 +5,7 @@
linux:
system:
repo:
- tcpcloud_opencontrail:
+ mcp_opencontrail:
source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
\ No newline at end of file
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
diff --git a/linux/system/repo/mcp/salt.yml b/linux/system/repo/mcp/salt.yml
index 08e7614..e7240a4 100644
--- a/linux/system/repo/mcp/salt.yml
+++ b/linux/system/repo/mcp/salt.yml
@@ -4,7 +4,7 @@
linux:
system:
repo:
- mcp_extra:
+ mcp_salt:
source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} salt"
architectures: amd64
- key_url: "http://apt-mk.mirantis.com/public.gpg"
\ No newline at end of file
+ key_url: "http://apt-mk.mirantis.com/public.gpg"
diff --git a/salt/master/pkg.yml b/salt/master/pkg.yml
index 046512f..b075138 100644
--- a/salt/master/pkg.yml
+++ b/salt/master/pkg.yml
@@ -7,4 +7,4 @@
- system.salt.master.formula.pkg.saltstack
- system.salt.master.formula.pkg.stacklight
- system.salt.master.formula.pkg.monitoring
-- system.linux.system.repo.tcp_salt
+- system.linux.system.repo.mcp.salt