Merge "Add tests for salt-formula-hubble"
diff --git a/jenkins/client/init.yml b/jenkins/client/init.yml
index 856eec5..c1d600c 100644
--- a/jenkins/client/init.yml
+++ b/jenkins/client/init.yml
@@ -19,30 +19,41 @@
password: ${_param:jenkins_client_password}
plugin:
artifactory: {}
+ blueocean: {}
build-blocker-plugin: {}
build-monitor-plugin: {}
+ build-timeout: {}
build-user-vars-plugin: {}
categorized-view: {}
+ copyartifact: {}
description-setter: {}
discard-old-build: {}
docker-workflow: {}
email-ext: {}
+ envinject: {}
extended-choice-parameter: {}
extensible-choice-parameter: {}
gerrit-trigger: {}
git: {}
+ github: {}
heavy-job: {}
jobConfigHistory: {}
jira: {}
ldap: {}
+ lockable-resources: {}
matrix-auth: {}
monitoring: {}
+ multiple-scms: {}
performance: {}
+ permissive-script-security: {}
pipeline-utility-steps: {}
+ prometheus: {}
rebuild: {}
simple-theme-plugin: {}
slack: {}
+ ssh-agent: {}
test-stability: {}
+ throttle-concurrents: {}
workflow-cps: {}
workflow-remote-loader: {}
workflow-scm-step:
diff --git a/jenkins/client/job/debian/packages/horizon/modules.yml b/jenkins/client/job/debian/packages/horizon/modules.yml
index c908e5c..357be6e 100644
--- a/jenkins/client/job/debian/packages/horizon/modules.yml
+++ b/jenkins/client/job/debian/packages/horizon/modules.yml
@@ -126,6 +126,18 @@
os_version: pike
branch: stable/pike
# Trusty
+ - name: horizon-contrail-panels
+ os: ubuntu
+ dist: trusty
+ os_version: queens
+ branch: stable/queens
+ # Xenial
+ - name: horizon-contrail-panels
+ os: ubuntu
+ dist: xenial
+ os_version: queens
+ branch: stable/queens
+ # Trusty
- name: horizon-jenkins-dashboard
os: ubuntu
dist: trusty
diff --git a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
index f92d1a7..306866b 100644
--- a/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
+++ b/jenkins/client/job/opencontrail/git-mirrors/downstream.yml
@@ -16,7 +16,7 @@
- name: contrail-third-party
branches: ${_param:contrail_branches}
- name: contrail-generateDS
- branches: ${_param:contrail_branches}
+ branches: ${_param:contrail_branches_generateDS}
- name: contrail-sandesh
branches: ${_param:contrail_branches}
- name: contrail-packages
diff --git a/jenkins/client/job/opencontrail/init.yml b/jenkins/client/job/opencontrail/init.yml
index c6d1ca6..997d885 100644
--- a/jenkins/client/job/opencontrail/init.yml
+++ b/jenkins/client/job/opencontrail/init.yml
@@ -4,6 +4,8 @@
parameters:
_param:
contrail_branches: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.1,R5.0,master"
+ # generateDS does not have 5.0 branch
+ contrail_branches_generateDS: "R3.0.2.x,R3.0.3.x,R3.1,R3.1.1.x,R3.2,R3.2.3.x,R4.0,R4.1,master"
contrail_kubernetes_branches: "master,release-1.2"
contrail_dpdk_extra_branches: "mitaka,mitaka_dpdk_17_02,mitaka_dpdk_17_05,kilo,liberty-multiqueue,newton,ocata"
contrail_ceilometer_plugin_branches: "master,R4.0,R4.1"
diff --git a/jenkins/client/job/oscore/cookiecutter.yml b/jenkins/client/job/oscore/cookiecutter.yml
index c1b193d..04a805a 100644
--- a/jenkins/client/job/oscore/cookiecutter.yml
+++ b/jenkins/client/job/oscore/cookiecutter.yml
@@ -28,8 +28,12 @@
type: choice
description: "Context for coockiecutter template specified as filename."
choices:
- - openstack_ovs_non-dvr_vlan
- - openstack_ovs_non-dvr_vxlan
+ - openstack-ovs-core-pike
+ - openstack-ovs-core-ssl-pike
+ - openstack-ovs-core-barbican-pike
+ - openstack-ovs-core-manila-pike
+ - openstack-ovs-core-telemetry-pike
+ - openstack-ovs-core-queens
STACK_INSTALL:
type: string
default: 'core,openstack,ovs'
@@ -69,3 +73,57 @@
type: boolean
description: "Delete Heat stack when finished (bool)"
default: 'false'
+ oscore-test-cookiecutter-models:
+ display_name: oscore-test-cookiecutter-models
+ name: oscore-test-cookiecutter-models
+ concurrent: true
+ discard:
+ build:
+ keep_num: 30
+ artifact:
+ keep_num: 30
+ type: workflow-scm
+ concurrent: true
+ scm:
+ type: git
+ url: "${_param:jenkins_gerrit_url}/openstack-ci/openstack-pipelines.git"
+ credentials: "gerrit"
+ branch: 'master'
+ script: test-cookiecutter-models-pipeline.groovy
+ trigger:
+ gerrit:
+ project:
+ "^mk/cookiecutter-templates$":
+ compare_type: 'REG_EXP'
+ branches:
+ - master
+ skip_vote:
+ - successful
+ - failed
+ - unstable
+ - not_built
+ event:
+ comment:
+ - addedContains:
+ commentAddedCommentContains: '^(?s:Patch Set \d+:.*(test|recheck|reverify)\s*)$'
+ param:
+ CREDENTIALS_ID:
+ type: string
+ default: "gerrit"
+ description: "ID of jenkins credentials to be used when connecting to gerrit."
+ OPENSTACK_API_PROJECT:
+ type: string
+ default: "mcp-oscore-ci"
+ HEAT_STACK_ZONE:
+ type: string
+ default: "mcp-oscore-ci"
+ FLAVOR_PREFIX:
+ type: string
+ default: 'dev'
+ TEST_SCHEME:
+ type: text
+ description: "Yaml based scheme to test specific models."
+ default: |-
+ openstack-ovs-core-pike:
+ run_smoke: true
+ stack_install: 'core,openstack,ovs'
diff --git a/maas/region/boot_sources/maas_ephemeral_v3/bss_xenial.yml b/maas/region/boot_sources/maas_ephemeral_v3/bss_xenial.yml
new file mode 100644
index 0000000..a1d1620
--- /dev/null
+++ b/maas/region/boot_sources/maas_ephemeral_v3/bss_xenial.yml
@@ -0,0 +1,17 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ maas_region_boot_sources_maas_ephemeral_v3_version: ${_param:apt_mk_version}
+ maas_region_boot_sources_maas_ephemeral_v3_host_url: "http://mirror.mirantis.com/"
+ # http://mirror.mirantis.com/nightly/maas-ephemeral-v3/
+ maas_region_boot_sources_maas_ephemeral_v3_url: "${_param:linux_system_repo_maas_ephemeral_v3_host_url}/${_param:apt_mk_version}/maas-ephemeral-v3/"
+ maas:
+ region:
+ boot_sources_selections:
+ xenial:
+ url: "${_param:maas_region_boot_sources_maas_ephemeral_v3_url}"
+ os: "ubuntu"
+ release: "xenial"
+ arches: "amd64"
+ subarches: '"*"'
+ labels: '"*"'
diff --git a/maas/region/boot_sources/maas_ephemeral_v3/init.yml b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
new file mode 100644
index 0000000..965f333
--- /dev/null
+++ b/maas/region/boot_sources/maas_ephemeral_v3/init.yml
@@ -0,0 +1,14 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ maas_region_boot_sources_maas_ephemeral_v3_version: ${_param:apt_mk_version}
+ maas_region_boot_sources_maas_ephemeral_v3_host_url: "http://mirror.mirantis.com/"
+ # http://mirror.mirantis.com/nightly/maas-ephemeral-v3/
+ maas_region_boot_sources_maas_ephemeral_v3_url: "${_param:linux_system_repo_maas_ephemeral_v3_host_url}/${_param:apt_mk_version}/maas-ephemeral-v3/"
+ maas:
+ region:
+ boot_sources_delete_all_others: true
+ boot_sources:
+ resources_mirror:
+ url: ${_param:maas_region_boot_sources_maas_ephemeral_v3_url}
+ keyring_file: /usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
diff --git a/opencontrail/control/analytics4_0.yml b/opencontrail/control/analytics4_0.yml
index 9614d61..ee8462a 100644
--- a/opencontrail/control/analytics4_0.yml
+++ b/opencontrail/control/analytics4_0.yml
@@ -1,4 +1,5 @@
classes:
+- service.docker.host
- service.haproxy.proxy.single
- service.keepalived.cluster.single
- service.opencontrail.control.analytics
diff --git a/opencontrail/control/control4_0.yml b/opencontrail/control/control4_0.yml
index 02ab75e..10c72ee 100644
--- a/opencontrail/control/control4_0.yml
+++ b/opencontrail/control/control4_0.yml
@@ -1,4 +1,5 @@
classes:
+- service.docker.host
- service.keepalived.cluster.single
- service.opencontrail.control.control
- system.haproxy.proxy.listen.opencontrail.control
diff --git a/opencontrail/control/single4_0.yml b/opencontrail/control/single4_0.yml
index a4fae18..df551ef 100644
--- a/opencontrail/control/single4_0.yml
+++ b/opencontrail/control/single4_0.yml
@@ -1,4 +1,5 @@
classes:
+- service.docker.host
- service.opencontrail.control.single
- service.haproxy.proxy.single
parameters:
diff --git a/openssh/server/team/members/dstremkouski.yml b/openssh/server/team/members/dstremkouski.yml
new file mode 100644
index 0000000..ba3233b
--- /dev/null
+++ b/openssh/server/team/members/dstremkouski.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ dstremkouski:
+ enabled: true
+ name: dstremkouski
+ sudo: true
+ full_name: Dzmitry Stremkouski
+ home: /home/dstremkouski
+ email: dstremkouski@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ dstremkouski:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDlvA0GjsFF4p0oRF/49/k0YYqkCpsmKHoMtM2b/ZgRAbUzuobEqOZILkGkbvWTKQrq1BbMjGk/11EvCA07f+N8Z2Rj9lw9+tlqPy4K/90BNPvLcjBlKXruZFZWtQmbBWsA150PjvrqSD1pju+qkpC3tavgC4S0HxT9Gl9F+IuqCEfvRSNhRJrl2UWPHTolTfE7NOlX3745OEXTH4AFp/lgy+wyvGJBujfGZOjjuiGyPl71cS9t7yJBxTXdZxDDrjmaFmsftpK0Q+JccNHLzlj2hrkrWTPnrP70hbzgyoxw+JwOXmsnE8Q8WHxEgYyPfA4dxkZsktQbE51zGvU/yIxGJ5zV9AF2Y7pxzOXHq9sPXwgoJneW9JHCkH7BSw56+EHagEDeYeKD/1aIaRJbeyfltTTbK05J8nhyrdKFGENazEHoDYmhWk7Jdd7X/E2nEYWmYTje4YacHVOM1P9Guqs8n8VrUnYXreogJ9tOZs/Ydl/+I52ITvuK7w+SsVcl5wuxuoclg6dsa1RrDpKm9emN2OKS3RqJBNjnfSUaeGLrDSYENm/+PUEhvhKAd+DTpjnYb+oKsf4QegGFJtoHoZNNIlSvnjpjO2VC+g0Ci11JTaq/LwfNb7OJMYURzFwlW8BRmJWZ8BnnhNhw+vZG6fa7yyeIW9OVpVtqQBPpA5Qumw== argentina
+ user: ${linux:system:user:dstremkouski}
diff --git a/openssh/server/team/members/ohryhorov.yml b/openssh/server/team/members/ohryhorov.yml
new file mode 100644
index 0000000..bcd2ed0
--- /dev/null
+++ b/openssh/server/team/members/ohryhorov.yml
@@ -0,0 +1,20 @@
+parameters:
+ linux:
+ system:
+ user:
+ ohryhorov:
+ enabled: true
+ name: ohryhorov
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Oleh Hryhorov
+ home: /home/ohryhorov
+ email: ohryhorov@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ ohryhorov:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDURrVLvo44rOSe/2GBh69SPS06Jam21dJrunM9TzuxcHkw7u/rVLMA+pDMMwu/x2n8fFkW7wrd3/6QH7cLOGt1Xw4PDfFA17ZGmV7HwZ1XOeoux2+47TFkGeHyeHOqf7xKMW4o35tKDXd5uipW9opl7+Zm/l7ucd6TKnGjh9vA3nD9xqF8Gxb6qvY7W35EFMPAwU9sK9lMwM/LkuUJirEP11sIK38OoEC2aysNtXZyKdQ9LgmBWZGbaCod0LzgAJd29zQOxWOHHWOE7PK4zHVWYN3AxfiIWSg2mxqARMnqZpPulqbgwVETxLsJJSnPOvvTwoVggimxXh1HPUI7wUnb ohryhorov@ohryhorov-pc
+ user: ${linux:system:user:ohryhorov:}
diff --git a/openssh/server/team/members/vblokhin.yml b/openssh/server/team/members/vblokhin.yml
new file mode 100644
index 0000000..74ae49c
--- /dev/null
+++ b/openssh/server/team/members/vblokhin.yml
@@ -0,0 +1,21 @@
+parameters:
+ linux:
+ system:
+ user:
+ vblokhin:
+ enabled: true
+ name: vblokhin
+ sudo: ${_param:linux_system_user_sudo}
+ full_name: Volodymyr Blokhin
+ home: /home/vblokhin
+ email: vblokhin@mirantis.com
+ openssh:
+ server:
+ enabled: true
+ user:
+ vblokhin:
+ enabled: true
+ public_keys:
+ - key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDY5F0bDcbiCtO5HkwIVgjwAwCHcTRDZwEIE5cwuGlXNKWk9JtlDKh724Dp8f/Yny1e30Kt9oqs23bv6xfMh4pU4vrajjSv9f+s3hCSs1X9JrlEw92CD7r+jpq2R0vz3ufeHZWSWmeMsRR62BodtYy4EkoyPKvq16guq745KHTYgATm/qJgCkjQ5lxca280i0z14Fv+JOtVxrk52xMTxHS+N6wzVOjuEjBbW2vyktsV/RidT/SoJAVMHoPISjJTR+q5usVuKb6J5U83Y2vbmUCnygAnPX6l9k8atsAvwl1v54QxWE6Qz61kMPpwZZ56BNGhCZ458HqqXiybx4lU4PN6eg/zPA9Eq+xj5ZoXaUK1hg2UpJrmrtCh8H4T+/dPySZ+HMDBp221DCuH43x9No6V0QWhifhHPaGWyeK+mGsznbaSnlZ0QxRun5qWgjG7xHu97zgxjlyxmQII8FWGaOSuv/w6jg894A4jcsDfH5oxDbgVTbqqZG9o7TszIXKTImt1f2fmKKr/CT7ixwIKO3MioUNu3PoQ/GhmKajqugV+TIRe4vJ2FD5hl11ythzLlZCchzlEoymap4P6Y5dMh60YErCtYftn7jATJKSq9EHiLEeTIQDBVqhJzdS9/QWAXBV97mNX7mib1dO0H9TBZu1mYMZio7udbx9oursrVPq3fw== vblokhin@mirantis.com
+ user: ${linux:system:user:vblokhin}
+
diff --git a/openssh/server/team/oscore_devops.yml b/openssh/server/team/oscore_devops.yml
index 89870b0..0ad8691 100644
--- a/openssh/server/team/oscore_devops.yml
+++ b/openssh/server/team/oscore_devops.yml
@@ -6,6 +6,7 @@
- system.openssh.server.team.members.iudovichenko
- system.openssh.server.team.members.vdrok
- system.openssh.server.team.members.ikolodyazhny
+- system.openssh.server.team.members.ohryhorov
parameters:
_param:
linux_system_user_sudo: true
diff --git a/openssh/server/team/services.yml b/openssh/server/team/services.yml
index a704e04..be901d8 100644
--- a/openssh/server/team/services.yml
+++ b/openssh/server/team/services.yml
@@ -15,6 +15,8 @@
- system.openssh.server.team.members.tjaroszyk
- system.openssh.server.team.members.sburns
- system.openssh.server.team.members.yisakov
+- system.openssh.server.team.members.vblokhin
+- system.openssh.server.team.members.dstremkouski
parameters:
_param:
linux_system_user_sudo: true