Merge pull request #241 from Mirantis/change_mcp_repo
change mcp repo structure
diff --git a/jenkins/client/job/debian/packages/salt.yml b/jenkins/client/job/debian/packages/salt.yml
index 094ae79..5e6665c 100644
--- a/jenkins/client/job/debian/packages/salt.yml
+++ b/jenkins/client/job/debian/packages/salt.yml
@@ -159,6 +159,8 @@
dist: trusty
- name: rsyslog
dist: trusty
+ - name: rundeck
+ dist: trusty
- name: sahara
dist: trusty
- name: salt
@@ -335,6 +337,8 @@
dist: xenial
- name: rsync
dist: xenial
+ - name: rundeck
+ dist: xenial
- name: rsyslog
dist: xenial
- name: sahara
diff --git a/jenkins/client/job/deploy/lab/mk/init.yml b/jenkins/client/job/deploy/lab/mk/init.yml
index 0fc26f7..17dca28 100644
--- a/jenkins/client/job/deploy/lab/mk/init.yml
+++ b/jenkins/client/job/deploy/lab/mk/init.yml
@@ -19,6 +19,9 @@
url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
credentials: "gerrit"
script: lab-pipeline.groovy
+ trigger:
+ timer:
+ spec: "{{timer}}"
param:
# deployments and test settings
STACK_TYPE:
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index 7e05368..8e82f76 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -35,14 +35,17 @@
install: core,openstack,contrail
stack_type: heat
test: openstack
+ timer: "H H(0-6) * * *"
- lab: virtual_mcp10_dvr
install: core,openstack,dvr
stack_type: heat
test: openstack
+ timer: "H H(0-6) * * *"
- lab: virtual_mcp10_ovs
install: core,openstack,ovs
stack_type: heat
test: openstack
+ timer: "H H(0-6) * * *"
# mcp11
- lab: virtual_mcp11_contrail
install: core,openstack,contrail
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 7bb0dac..2f1f49a 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -1,6 +1,11 @@
parameters:
jenkins:
client:
+ view:
+ Docker:
+ enabled: true
+ type: ListView
+ include_regex: ".*-docker-.*"
job_template:
docker-build-image:
name: docker-build-image-{{name}}-{{branch}}
diff --git a/jenkins/client/job/opencontrail/build/generic.yml b/jenkins/client/job/opencontrail/build/generic.yml
index 75ba8bf..a26472b 100644
--- a/jenkins/client/job/opencontrail/build/generic.yml
+++ b/jenkins/client/job/opencontrail/build/generic.yml
@@ -49,6 +49,18 @@
branch: R3.2
ppa: mirantis-opencontrail/opencontrail-3.2
upload_source_package: true
+ - buildname: oc666
+ os: ubuntu
+ dist: trusty
+ branch: master
+ ppa: mirantis-opencontrail/opencontrail-master
+ upload_source_package: false
+ - buildname: oc666
+ os: ubuntu
+ dist: xenial
+ branch: master
+ ppa: mirantis-opencontrail/opencontrail-master
+ upload_source_package: false
template:
discard:
build:
diff --git a/linux/system/repo_local/mcp/extra.yml b/linux/system/repo_local/mcp/extra.yml
index 67d85a5..a0c54d6 100644
--- a/linux/system/repo_local/mcp/extra.yml
+++ b/linux/system/repo_local/mcp/extra.yml
@@ -5,8 +5,7 @@
system:
repo:
mcp_extra:
- default: true
refresh_db: ${_param:linux_repo_refresh_db}
source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} extra"
architectures: amd64
- key_url: "http://${_param:local_repo_url}/public.gpg"
\ No newline at end of file
+ key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/reclass/storage/system/rsyslog_single.yml b/reclass/storage/system/rsyslog_single.yml
new file mode 100644
index 0000000..a3eefac
--- /dev/null
+++ b/reclass/storage/system/rsyslog_single.yml
@@ -0,0 +1,15 @@
+parameters:
+ _param:
+ rsyslog_node01_hostname: rsl01
+ reclass:
+ storage:
+ node:
+ rsyslog_node01:
+ name: ${_param:rsyslog_node01_hostname}
+ domain: ${_param:cluster_domain}
+ classes:
+ - cluster.${_param:cluster_name}.infra.rsyslog
+ params:
+ salt_master_host: ${_param:reclass_config_master}
+ linux_system_codename: xenial
+ single_address: ${_param:rsyslog_node01_address}
diff --git a/salt/control/cluster/rsyslog_single.yml b/salt/control/cluster/rsyslog_single.yml
new file mode 100644
index 0000000..4e53747
--- /dev/null
+++ b/salt/control/cluster/rsyslog_single.yml
@@ -0,0 +1,18 @@
+parameters:
+ salt:
+ control:
+ size:
+ infra.rsyslog:
+ cpu: 8
+ ram: 8192
+ disk_profile: xxlarge
+ net_profile: default
+ cluster:
+ internal:
+ domain: ${_param:cluster_domain}
+ engine: virt
+ node:
+ rsl01:
+ provider: kvm02.${_param:cluster_domain}
+ image: ${_param:salt_control_xenial_image}
+ size: infra.rsyslog
diff --git a/salt/master/formula/git/oss.yml b/salt/master/formula/git/oss.yml
index 3c555ee..5c9577a 100644
--- a/salt/master/formula/git/oss.yml
+++ b/salt/master/formula/git/oss.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- salt_master_oss_repository: https://gerrit.mcp.mirantis.net/oss
+ salt_master_oss_repository: https://gerrit.mcp.mirantis.net/salt-formulas
salt_master_oss_revision: master
salt:
master:
@@ -12,5 +12,5 @@
devops_utils.py:
enabled: true
source: git
- address: '${_param:salt_master_oss_repository}/salt-formula-devops-portal.git'
+ address: '${_param:salt_master_oss_repository}/devops-portal.git'
revision: ${_param:salt_master_oss_revision}