Merge pull request #229 from Mirantis/newton
Newton compatability
diff --git a/jenkins/client/job/deploy/lab/mk/virtual.yml b/jenkins/client/job/deploy/lab/mk/virtual.yml
index a97a22a..7e05368 100644
--- a/jenkins/client/job/deploy/lab/mk/virtual.yml
+++ b/jenkins/client/job/deploy/lab/mk/virtual.yml
@@ -3,6 +3,25 @@
parameters:
_param:
jenkins_deploy_lab_mk_jobs:
+ # mk20
+ - lab: virtual_mk20_advanced
+ install: core,openstack
+ stack_type: heat
+ test: openstack
+ - lab: virtual_mk20_basic
+ install: core,openstack
+ stack_type: heat
+ test: openstack
+ # mk22
+ - lab: virtual_mk22_advanced
+ install: core,openstack
+ stack_type: heat
+ test: openstack
+ - lab: virtual_mk22_basic
+ install: core,openstack
+ stack_type: heat
+ test: openstack
+ # mcp05
- lab: virtual_mcp05_dvr
install: core,openstack,dvr
stack_type: heat
@@ -11,6 +30,7 @@
install: core,openstack,ovs
stack_type: heat
test: openstack
+ # mcp10
- lab: virtual_mcp10_contrail
install: core,openstack,contrail
stack_type: heat
@@ -23,23 +43,20 @@
install: core,openstack,ovs
stack_type: heat
test: openstack
- - lab: virtual_mcp10_k8s
+ # mcp11
+ - lab: virtual_mcp11_contrail
+ install: core,openstack,contrail
+ stack_type: heat
+ test: openstack
+ - lab: virtual_mcp11_dvr
+ install: core,openstack,dvr
+ stack_type: heat
+ test: openstack
+ - lab: virtual_mcp11_ovs
+ install: core,openstack,ovs
+ stack_type: heat
+ test: openstack
+ - lab: virtual_mcp11_k8s
install: core,k8s
stack_type: heat
test: k8s
- - lab: virtual_mk20_advanced
- install: core,openstack
- stack_type: heat
- test: openstack
- - lab: virtual_mk20_basic
- install: core,openstack
- stack_type: heat
- test: openstack
- - lab: virtual_mk22_advanced
- install: core,openstack
- stack_type: heat
- test: openstack
- - lab: virtual_mk22_basic
- install: core,openstack
- stack_type: heat
- test: openstack
diff --git a/jenkins/client/job/docker/aptly.yml b/jenkins/client/job/docker/aptly.yml
index eefbb86..4e77d2a 100644
--- a/jenkins/client/job/docker/aptly.yml
+++ b/jenkins/client/job/docker/aptly.yml
@@ -22,14 +22,8 @@
branches:
- master
event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
+ ref:
+ - updated: {}
param:
IMAGE_GIT_URL:
type: string
diff --git a/jenkins/client/job/docker/init.yml b/jenkins/client/job/docker/init.yml
index 2056ee4..f4a6a87 100644
--- a/jenkins/client/job/docker/init.yml
+++ b/jenkins/client/job/docker/init.yml
@@ -45,14 +45,8 @@
branches:
- "{{branch}}"
event:
- patchset:
- - created:
- excludeDrafts: false
- excludeTrivialRebase: false
- excludeNoCodeChange: false
- comment:
- - addedContains:
- commentAddedCommentContains: '(recheck|reverify)'
+ ref:
+ - updated: {}
param:
IMAGE_NAME:
type: string
diff --git a/jenkins/client/job/opencontrail/build/dpdk-extra.yml b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
index 0ac7b50..f250a8c 100644
--- a/jenkins/client/job/opencontrail/build/dpdk-extra.yml
+++ b/jenkins/client/job/opencontrail/build/dpdk-extra.yml
@@ -73,3 +73,7 @@
ARCH:
type: string
default: "amd64"
+ BINARY_PACKAGES:
+ description: "binary packages to create"
+ type: string
+ default: "all"
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index 5e6a420..861ff5c 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -11,7 +11,7 @@
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
pin:
- pin: 'release a=${_param:openstack_version}'
- priority: 1050
+ priority: 1100
package: '*'
mirantis_openstack_hotfix:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main"
@@ -19,7 +19,7 @@
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
pin:
- pin: 'release a=${_param:openstack_version}-hotfix'
- priority: 1050
+ priority: 1100
package: '*'
mirantis_openstack_security:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main"
@@ -27,7 +27,7 @@
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
pin:
- pin: 'release a=${_param:openstack_version}-security'
- priority: 1050
+ priority: 1100
package: '*'
mirantis_openstack_updates:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main"
@@ -35,7 +35,7 @@
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
pin:
- pin: 'release a=${_param:openstack_version}-uptades'
- priority: 1050
+ priority: 1100
package: '*'
mirantis_openstack_holdback:
source: "deb http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main"
@@ -43,7 +43,7 @@
key_url: "http://mirror.fuel-infra.org/mcp-repos/${_param:mcp_repo_version}/${_param:linux_system_codename}/archive-mcp${_param:mcp_repo_version}.key"
pin:
- pin: 'release a=${_param:openstack_version}-holdback'
- priority: 1050
+ priority: 1100
package: '*'
mk_openstack:
source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:apt_mk_version} ${_param:openstack_version}"
diff --git a/linux/system/repo/sensu.yml b/linux/system/repo/sensu.yml
new file mode 100644
index 0000000..1ea3687
--- /dev/null
+++ b/linux/system/repo/sensu.yml
@@ -0,0 +1,8 @@
+parameters:
+ linux:
+ system:
+ repo:
+ sensu:
+ source: "deb https://sensu.global.ssl.fastly.net/apt ${_param:linux_system_codename} main"
+ architectures: amd64
+ key_url: "https://sensu.global.ssl.fastly.net/apt/pubkey.gpg"
\ No newline at end of file